[obsolete] Ubuntu QtCreator Plugins

Merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/refactoring-and-fixing into lp:ubuntu-qtcreator-plugins

  1. refactoring-and-fixing
  2. Merge into trunk
Proposed by Juhapekka Piiroinen
Status: Merged
Merged at revision: 189
Proposed branch: lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/refactoring-and-fixing
Merge into: lp:ubuntu-qtcreator-plugins
Diff against target: 2875 lines (+1496/-867)
57 files modified
Makefile (+69/-3)
README (+0/-34)
build (+0/-35)
build-package (+0/-21)
packaging/ubuntu-qtcreator-plugins.install (+0/-3)
patches/2013-04-control.patch (+0/-12)
prepare (+0/-41)
qt5libs/debian/changelog (+0/-11)
qt5libs/debian/compat (+0/-1)
qt5libs/debian/control (+0/-39)
qt5libs/debian/rules (+0/-27)
qt5libs/debian/source/format (+0/-1)
qt5libs/debian/source/include-binaries (+0/-331)
qt5libs/debian/ubuntu-qtcreator-qt5libs.install (+0/-2)
qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/Makefile (+0/-3)
qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/helloworld.qml (+0/-37)
qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/__init__.py (+0/-1)
qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/test_helloworld.py (+0/-39)
qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/__init__.py (+0/-54)
qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/Makefile (+0/-2)
qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/tst_test.qml (+0/-43)
ubuntu-qtcreator-plugins/debian/qtcreator-plugin-ubuntu.install (+4/-0)
ubuntu-qtcreator-plugins/debian/qtcreator.desktop (+10/-0)
ubuntu-qtcreator-plugins/debian/ubuntusdk.desktop (+11/-0)
ubuntu-qtcreator-plugins/share/qtcreator/static.pro (+126/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/backend/backend.h (+21/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json (+48/-36)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/Makefile (+18/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml (+14/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/main.qml (+4/-2)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/__init__.py (+129/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/__init__.py (+1/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/test_main.py (+38/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/unit/tst_hellocomponent.qml (+49/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/Makefile (+18/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/components/HelloComponent.qml (+14/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/main.qml (+6/-45)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/__init__.py (+129/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/__init__.py (+1/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/test_main.py (+23/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit/tst_hellocomponent.qml (+49/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/HelloTab.qml (+30/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTab.qml (+35/-0)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTabTools.qml (+13/-0)
ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json (+7/-0)
ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_search (+2/-1)
ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery (+2/-0)
ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_project_packaging (+1/-0)
ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings (+24/-0)
ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/Link.qml (+79/-0)
ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/NewsBox.qml (+79/-0)
ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/welcome.qml (+62/-35)
ubuntu-qtcreator-plugins/src/plugins/plugins.pro (+361/-0)
ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntu.pro (+6/-6)
ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuconstants.h (+1/-0)
ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.cpp (+1/-1)
ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp (+11/-1)
To merge this branch: bzr merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/refactoring-and-fixing
Reviewer Review Type Date Requested Status
Juhapekka Piiroinen Pending
Review via email: mp+167125@code.launchpad.net

Description of the change

Fixed bugs:
Bug #1172241: Integrate tests inside the application templates
Bug #1180193: Qt Creator should be renamed 'Ubuntu SDK'
Bug #1180195: Remove duplicate Welcome view
Bug #1181125: Missing example QML code for using the "QML Extension LIbrary"
Bug #1186220: remove qt5libs package generation
Bug #1186230: Separate Ubuntu plugin from QtCreator sources so that it can be built (and QA'd) separately instead of maintaining a patch

To post a comment you must log in.
lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/refactoring-and-fixing updated
197. By Juhapekka Piiroinen

Fixed bug #1186996 Have the UI Toolkit gallery launchable from Qt Creator

198. By Juhapekka Piiroinen

Fixes bug #1174900 [bazaar] set UserEmail and UserName

199. By Juhapekka Piiroinen

Fixes bug #1180192 When searching in the dash, 'Ubuntu SDK' should find Qt Creator

200. By Juhapekka Piiroinen

Removed the bazaar related code lines. To be fixed in the bazaar plugin itself.

Added "make install" target.

201. By Juhapekka Piiroinen

fixed gallery launching

202. By Juhapekka Piiroinen

Fixed autopilot test for simple template.

203. By Juhapekka Piiroinen

removed autopilot and unit templates.

204. By Juhapekka Piiroinen

work in progress commit

205. By Juhapekka Piiroinen

Fixed python module name to lowercase

206. By Juhapekka Piiroinen

Fixed simple application template

207. By Juhapekka Piiroinen

Improved Tabbed template

208. By Juhapekka Piiroinen

Added missing autopilot tests to json file

209. By Juhapekka Piiroinen

Commented out automaticOrientation which is available only in the latest ubuntu-ui-toolkit.

210. By Juhapekka Piiroinen

Improved application templates

211. By Juhapekka Piiroinen

fixed typo

212. By Juhapekka Piiroinen

fixed filename issue

213. By Juhapekka Piiroinen

added missing file

214. By Juhapekka Piiroinen

Added new targets:
 build-dep installs all build dependencies
 build-dep-ppa adds all required ppa's

215. By Juhapekka Piiroinen

We can not unload the Designer, we should disable it instead when ubuntu project is loaded. A project manager is required.
We need the deb-src for ubuntu-sdk-team ppa.

216. By Juhapekka Piiroinen

Cleaned autopilot tests for tabbed ui.
Added "hasTests" property to projecttypes.json file.

217. By Juhapekka Piiroinen

Added "make run" target to project Makefile.
Add "Makefile" to qmlproject.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-02-14 11:08:07 +0000
3+++ Makefile 2013-06-10 18:40:33 +0000
4@@ -1,6 +1,72 @@
5+CORES = `cat /proc/cpuinfo |grep processor|wc -l`
6+VERSION = 2.7.1
7+SRCPATH = qtcreator-${VERSION}
8+ARCH = $(shell arch)
9+BUILDPATH = build-$(ARCH)
10+
11 all:
12- ./prepare
13- ./build
14+ make src
15+ make build
16+
17+src:
18+ apt-get source qtcreator=${VERSION}
19+ sed -i "s/qtcreator-plugin/#qtcreator-plugin/g" $(SRCPATH)/debian/patches/series
20+ sed -i "s/ubuntu/#ubuntu/g" $(SRCPATH)/debian/patches/series
21+ sed -i "s/tar xvf debian/#tar xvf debian/g" $(SRCPATH)/debian/rules
22+ cp $(SRCPATH)/src/plugins/plugins.pro $(SRCPATH)/src/plugins/plugins.pro.orig
23+ cp $(SRCPATH)/share/qtcreator/static.pro $(SRCPATH)/share/qtcreator/static.pro.orig
24+ make copy-plugin-src
25+
26+copy-plugin-src:
27+ cp -r ubuntu-qtcreator-plugins/* $(SRCPATH)/
28+
29+update-plugin-share:
30+ cp -r ubuntu-qtcreator-plugins/share $(BUILDPATH)/
31+
32+clean-src:
33+ rm -Rf $(SRCPATH)
34+
35+clean-build:
36+ rm -Rf $(BUILDPATH)
37+
38+clean-project:
39+ make clean-src
40+ make clean-build
41+ rm qtcreator_${VERSION}*
42+
43+build:
44+ mkdir -p $(BUILDPATH)
45+ set -e; cd $(BUILDPATH); \
46+ qmake -r ../$(SRCPATH); \
47+ make -j${CORES}
48+
49+run:
50+ $(BUILDPATH)/bin/qtcreator
51
52 clean:
53- rm tmp -Rf
54+ cd $(BUILDPATH); make clean
55+
56+distclean:
57+ cd $(BUILDPATH); make distclean
58+
59+install:
60+ cd $(BUILDPATH); INSTALL_ROOT=/usr make install
61+ cp $(SRCPATH)/debian/*.desktop /usr/share/applications
62+
63+release:
64+ cd $(SRCPATH); \
65+ dch -U; \
66+ dch -r
67+
68+package:
69+ make src
70+ cd $(SRCPATH); dpkg-buildpackage -us -uc -nc -j${CORES}
71+
72+build-dep:
73+ sudo apt-get build-dep qtcreator
74+
75+build-dep-ppa:
76+ sudo apt-add-repository ppa:ubuntu-sdk-team/ppa
77+ sudo sed -i "s/# deb-src/deb-src/g" /etc/apt/sources.list.d/ubuntu-sdk-team-ppa-*.list
78+ sudo apt-add-repository ppa:canonical-qt5-edgers/qt5-proper
79+ sudo apt-get update
80
81=== removed file 'README'
82--- README 2013-05-01 21:17:32 +0000
83+++ README 1970-01-01 00:00:00 +0000
84@@ -1,34 +0,0 @@
85-
86-Ubuntu Qt Creator plugins
87-===================================
88-
89-0) This plugin requires following:
90-
91- qtcreator
92- android-tools-adb
93-
94-1) Scripts
95------------------------------------
96- prepare This script will fetch the Qt Creator source code
97- and creates a source package.
98-
99- build This script builds the project inside pbuilder-dist.
100- Accepts command line argument 'release'.
101-
102- build-package This script will execute dpkg-buildpackage
103-
104-
105-2) Directories
106------------------------------------
107- qtcreator This directory contains the Ubuntu Qt Creator plugin.
108-
109- patches This directory contains the patches which are executed with 'prepare'
110-
111- packaging This directory contains the packaging related changes which are done in 'prepare'
112-
113-
114-3) Makefile
115------------------------------------
116- make Build project in pbuilder-dist
117- make clean Deletes the temporary files which were created during 'make' / 'prepare'
118-
119
120=== removed file 'build'
121--- build 2013-04-08 13:34:07 +0000
122+++ build 1970-01-01 00:00:00 +0000
123@@ -1,35 +0,0 @@
124-#!/bin/bash
125-# Copyright 2013 Canonical Ltd.
126-#
127-# This program is free software; you can redistribute it and/or modify
128-# it under the terms of the GNU Lesser General Public License as published by
129-# the Free Software Foundation; version 2.1.
130-#
131-# This program is distributed in the hope that it will be useful,
132-# but WITHOUT ANY WARRANTY; without even the implied warranty of
133-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
134-# GNU Lesser General Public License for more details.
135-#
136-# You should have received a copy of the GNU Lesser General Public License
137-# along with this program. If not, see <http://www.gnu.org/licenses/>.
138-#
139-# Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com>
140-
141-echo
142-echo "Compiling project in pbuilder-dist."
143-echo "-----------------------------------"
144-read -p "Distribution: " DIST
145-read -p "Architecture: " ARCH
146-echo
147-DSCFILE=`ls -t tmp/*.dsc|head -n1`
148-echo "Building $DSCFILE"
149-pbuilder-dist $DIST $ARCH build $DSCFILE
150-if [ $? == 1 ]; then
151- echo
152- echo "Have you created the target with:"
153- echo " pbuilder-dist $DIST $ARCH create"
154- echo
155- exit
156-fi
157-echo "-----------------------------------"
158-echo "Check results in ~/pbuilder/"
159
160=== removed file 'build-package'
161--- build-package 2013-04-08 13:34:07 +0000
162+++ build-package 1970-01-01 00:00:00 +0000
163@@ -1,21 +0,0 @@
164-#!/bin/bash
165-# Copyright 2013 Canonical Ltd.
166-#
167-# This program is free software; you can redistribute it and/or modify
168-# it under the terms of the GNU Lesser General Public License as published by
169-# the Free Software Foundation; version 2.1.
170-#
171-# This program is distributed in the hope that it will be useful,
172-# but WITHOUT ANY WARRANTY; without even the implied warranty of
173-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
174-# GNU Lesser General Public License for more details.
175-#
176-# You should have received a copy of the GNU Lesser General Public License
177-# along with this program. If not, see <http://www.gnu.org/licenses/>.
178-#
179-# Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com>
180-cd tmp
181-cd qtcreator*
182-cp -r ../../qtcreator/* .
183-dpkg-source --commit --include-binaries
184-dpkg-buildpackage -us -uc -nc
185
186=== removed directory 'packaging'
187=== removed file 'packaging/ubuntu-qtcreator-plugins.install'
188--- packaging/ubuntu-qtcreator-plugins.install 2013-02-14 15:19:23 +0000
189+++ packaging/ubuntu-qtcreator-plugins.install 1970-01-01 00:00:00 +0000
190@@ -1,3 +0,0 @@
191-usr/share/qtcreator/templates/wizards/ubuntu
192-usr/share/qtcreator/ubuntu
193-usr/lib/*/qtcreator/plugins/Canonical
194
195=== removed symlink 'packaging/ubuntu-qtcreator-plugins.install.linux'
196=== target was u'ubuntu-qtcreator-plugins.install'
197=== removed directory 'patches'
198=== removed file 'patches/2013-04-control.patch'
199--- patches/2013-04-control.patch 2013-04-18 04:44:02 +0000
200+++ patches/2013-04-control.patch 1970-01-01 00:00:00 +0000
201@@ -1,12 +0,0 @@
202---- debian/control 2013-04-04 15:42:30.000000000 +0300
203-+++ debian/control 2013-04-12 10:32:02.126392842 +0300
204-@@ -57,7 +57,8 @@
205- qtdeclarative5-dev,
206- qmlscene,
207- qtcreator-doc,
208-- xterm | x-terminal-emulator
209-+ xterm | x-terminal-emulator,
210-+ dh-make
211- Suggests: cmake, git, kdelibs5-data, subversion, ubuntu-sdk, qtquick1-5-dev, qtquick1-5-dev-tools
212- Description: lightweight integrated development environment (IDE) for Qt
213- Qt Creator is a new, lightweight, cross-platform integrated development
214
215=== removed file 'prepare'
216--- prepare 2013-04-12 08:36:54 +0000
217+++ prepare 1970-01-01 00:00:00 +0000
218@@ -1,41 +0,0 @@
219-#!/bin/bash
220-# Copyright 2013 Canonical Ltd.
221-#
222-# This program is free software; you can redistribute it and/or modify
223-# it under the terms of the GNU Lesser General Public License as published by
224-# the Free Software Foundation; version 2.1.
225-#
226-# This program is distributed in the hope that it will be useful,
227-# but WITHOUT ANY WARRANTY; without even the implied warranty of
228-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
229-# GNU Lesser General Public License for more details.
230-#
231-# You should have received a copy of the GNU Lesser General Public License
232-# along with this program. If not, see <http://www.gnu.org/licenses/>.
233-#
234-# Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com>
235-set -e
236-
237-rm -Rf tmp
238-mkdir tmp
239-cd tmp
240-apt-get source qtcreator
241-if [[ $? != 0 ]]; then
242- exit 2
243-fi
244-cd qtcreator*
245-cp -dr ../../qtcreator/* .
246-set +e
247-patch -tp0 < ../../patches/2013-04-control.patch
248-#patch -tp0 < ../../patches/override_dh_shlibdeps-skip-ubuntu-qtcreator-plugins.diff
249-#patch -tp0 < ../../patches/add-new-packages.diff
250-#patch -tp0 < ../../patches/add-statics.diff
251-#patch -tp0 < ../../patches/fix-package-depends.diff
252-set -e
253-#cp -d ../../packaging/* debian/
254-if [[ $1 == "release" ]]; then
255- dch -U
256- dch -r
257-fi
258-dpkg-source --include-binaries --commit . ubuntu
259-debuild -S -sa -i -us -uc
260
261=== removed directory 'qt5libs'
262=== removed directory 'qt5libs/debian'
263=== removed file 'qt5libs/debian/changelog'
264--- qt5libs/debian/changelog 2013-02-15 16:36:55 +0000
265+++ qt5libs/debian/changelog 1970-01-01 00:00:00 +0000
266@@ -1,11 +0,0 @@
267-ubuntu-qtcreator-qt5libs (0.1-1ubuntu1) quantal; urgency=low
268-
269- * Quantal release
270-
271- -- Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> Fri, 15 Feb 2013 18:35:46 +0200
272-
273-ubuntu-qtcreator-qt5libs (0.1-1) unstable; urgency=low
274-
275- * Initial release
276-
277- -- Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com> Fri, 15 Feb 2013 16:29:09 +0200
278
279=== removed file 'qt5libs/debian/compat'
280--- qt5libs/debian/compat 2013-02-15 15:03:23 +0000
281+++ qt5libs/debian/compat 1970-01-01 00:00:00 +0000
282@@ -1,1 +0,0 @@
283-8
284
285=== removed file 'qt5libs/debian/control'
286--- qt5libs/debian/control 2013-02-15 16:36:55 +0000
287+++ qt5libs/debian/control 1970-01-01 00:00:00 +0000
288@@ -1,39 +0,0 @@
289-Source: ubuntu-qtcreator-qt5libs
290-Priority: extra
291-Maintainer: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com>
292-Build-Depends: debhelper (>= 9.0.0),
293- libqt5sql5-sqlite (>= 5.0.1~),
294- libqt5designercomponents5 (>= 5.0.1~),
295- libqt5designer5 (>= 5.0.1~),
296- libqt5clucene5 (>= 5.0.1~),
297- qttools5-private-dev (>= 5.0.1~),
298- libqt5v8-5-private-dev (>= 5.0.1~),
299- libqt5help5 (>= 5.0.1~),
300- qttools5-dev (>= 5.0.1~),
301- qttools5-dev-tools (>= 5.0.1~),
302- qt5-qmake (>= 5.0.1~),
303- qtbase5-private-dev (>= 5.0.1~),
304- libqt5script5 (>= 5.0.1~),
305- libqt5scripttools5 (>= 5.0.1~),
306- qt5-default,
307- qtscript5-private-dev (>= 5.0.1~),
308- qtxmlpatterns5-dev-tools (>= 5.0.1~),
309- libqt5widgets5 (>= 5.0.1~),
310- qttools5-dev-tools (>= 5.0.1~),
311- qtdeclarative5-private-dev (>= 5.0.1~),
312- qtdeclarative5-dev-tools (>= 5.0.1~),
313- qtquick1-5-dev (>= 5.0.1~),
314- qtquick1-5-dev-tools (>= 5.0.1~),
315- libqt5help5 (>= 5.0.1~),
316- qtlocation5-dev,
317- qtsensors5-dev
318-Standards-Version: 3.9.4
319-Section: libs
320-Homepage: http://launchpad.net/ubuntu-qtcreator-plugins
321-
322-Package: ubuntu-qtcreator-qt5libs
323-Section: libs
324-Architecture: any
325-Depends: ubuntu-qtcreator-plugins
326-Description: Qt 5 libraries for Qt Creator
327- This package contains Qt 5 libraries for Qt Creator.
328
329=== removed file 'qt5libs/debian/rules'
330--- qt5libs/debian/rules 2013-02-15 16:09:13 +0000
331+++ qt5libs/debian/rules 1970-01-01 00:00:00 +0000
332@@ -1,27 +0,0 @@
333-#!/usr/bin/make -f
334-# -*- makefile -*-
335-# Sample debian/rules that uses debhelper.
336-# This file was originally written by Joey Hess and Craig Small.
337-# As a special exception, when this file is copied by dh-make into a
338-# dh-make output file, you may use that output file without restriction.
339-# This special exception was added by Craig Small in version 0.37 of dh-make.
340-
341-# Uncomment this to turn on verbose mode.
342-export DH_VERBOSE=1
343-
344-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
345-TARGET_PATH=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator
346-BIN_PATH=$(CURDIR)/debian/tmp/usr/bin
347-%:
348- dh $@
349-
350-override_dh_installdirs:
351- mkdir -p $(BIN_PATH)
352- echo "#!/bin/bash" > $(BIN_PATH)/ubuntu-qtcreator
353- echo "QT_PLUGIN_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator/qt5/plugins qtcreator" >> $(BIN_PATH)/ubuntu-qtcreator
354- chmod +x $(BIN_PATH)/ubuntu-qtcreator
355-
356- mkdir -p $(TARGET_PATH)
357- cp -dr /usr/lib/$(DEB_HOST_MULTIARCH)/qt5 $(TARGET_PATH)
358- cp -d /usr/lib/$(DEB_HOST_MULTIARCH)/libQt5*so* $(TARGET_PATH)
359-
360
361=== removed directory 'qt5libs/debian/source'
362=== removed file 'qt5libs/debian/source/format'
363--- qt5libs/debian/source/format 2013-02-15 15:03:23 +0000
364+++ qt5libs/debian/source/format 1970-01-01 00:00:00 +0000
365@@ -1,1 +0,0 @@
366-3.0 (native)
367
368=== removed file 'qt5libs/debian/source/include-binaries'
369--- qt5libs/debian/source/include-binaries 2013-02-15 15:03:23 +0000
370+++ qt5libs/debian/source/include-binaries 1970-01-01 00:00:00 +0000
371@@ -1,331 +0,0 @@
372-usr
373-usr/lib
374-usr/lib/x86_64-linux-gnu
375-usr/lib/x86_64-linux-gnu/qtcreator
376-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Help.so.5.0.1
377-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DesignerComponents.so.5.0
378-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Help.so
379-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Script.so.5.0.1
380-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DBus.so.5.0.1
381-usr/lib/x86_64-linux-gnu/qtcreator/libQt5PrintSupport.so
382-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Gui.so
383-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Xml.so.5.0
384-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.so
385-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Declarative.so.5.0
386-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Help.so.5.0
387-usr/lib/x86_64-linux-gnu/qtcreator/libQt5XmlPatterns.so.5.0
388-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Core.so.5.0.1
389-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sql.so
390-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DesignerComponents.so
391-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Location.so.5
392-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Widgets.so
393-usr/lib/x86_64-linux-gnu/qtcreator/libQt5V8.so.5
394-usr/lib/x86_64-linux-gnu/qtcreator/libQt5CLucene.so.5.0.1
395-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DesignerComponents.so.5
396-usr/lib/x86_64-linux-gnu/qtcreator/libQt5CLucene.so.5.0
397-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Gui.so.5.0.1
398-usr/lib/x86_64-linux-gnu/qtcreator/libQt5CLucene.so.5
399-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Location.so.5.0
400-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Core.so.5
401-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Location.so
402-usr/lib/x86_64-linux-gnu/qtcreator/libQt5PrintSupport.so.5.0.1
403-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Qml.so.5
404-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKitWidgets.so.5.0
405-usr/lib/x86_64-linux-gnu/qtcreator/libQt53D.so.5
406-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Network.so.5
407-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Qml.so.5.0.1
408-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sql.so.5.0
409-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Concurrent.so.5.0
410-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKitWidgets.so.5
411-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Concurrent.so.5.0.1
412-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickParticles.so.5
413-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Network.so.5.0.1
414-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Concurrent.so.5
415-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Core.so
416-usr/lib/x86_64-linux-gnu/qtcreator/libQt5XmlPatterns.so.5
417-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickTest.so
418-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickTest.so.5
419-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Test.so.5.0.1
420-usr/lib/x86_64-linux-gnu/qtcreator/libQt5ScriptTools.so.5.0
421-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Quick.so
422-usr/lib/x86_64-linux-gnu/qtcreator/libQt5V8.so.5.0.1
423-usr/lib/x86_64-linux-gnu/qtcreator/libQt5PrintSupport.so.5.0
424-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Qml.so
425-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Test.so.5.0
426-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Xml.so.5.0.1
427-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Quick.so.5.0
428-usr/lib/x86_64-linux-gnu/qtcreator/libQt5CLucene.so
429-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Quick.so.5
430-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DBus.so.5.0
431-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickParticles.so
432-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Declarative.so
433-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sql.so.5.0.1
434-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Script.so
435-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Xml.so
436-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Declarative.so.5
437-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Location.so.5.0.0
438-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.so.5.0
439-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Network.so
440-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Network.so.5.0
441-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Concurrent.so
442-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sql.so.5
443-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Widgets.so.5.0
444-usr/lib/x86_64-linux-gnu/qtcreator/libQt5XmlPatterns.so.5.0.1
445-usr/lib/x86_64-linux-gnu/qtcreator/libQt5ScriptTools.so.5
446-usr/lib/x86_64-linux-gnu/qtcreator/libQt5OpenGL.so.5
447-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Test.so
448-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKitWidgets.so.5.0.1
449-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Designer.so.5
450-usr/lib/x86_64-linux-gnu/qtcreator/libQt5OpenGL.so.5.0.1
451-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Gui.so.5.0
452-usr/lib/x86_64-linux-gnu/qtcreator/libQt5OpenGL.so.5.0
453-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickTest.so.5.0
454-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DBus.so
455-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickParticles.so.5.0.1
456-usr/lib/x86_64-linux-gnu/qtcreator/libQt53D.so.5.0.0
457-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Gui.so.5
458-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DBus.so.5
459-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.prl
460-usr/lib/x86_64-linux-gnu/qtcreator/libQt53D.so.5.0
461-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Script.so.5.0
462-usr/lib/x86_64-linux-gnu/qtcreator/libQt5V8.so.5.0
463-usr/lib/x86_64-linux-gnu/qtcreator/libQt5PrintSupport.so.5
464-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Designer.so.5.0.1
465-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Quick.so.5.0.1
466-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Script.so.5
467-usr/lib/x86_64-linux-gnu/qtcreator/libQt5V8.so
468-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Help.so.5
469-usr/lib/x86_64-linux-gnu/qtcreator/libQt5ScriptTools.so.5.0.1
470-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickTest.so.5.0.1
471-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Designer.so.5.0
472-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Core.so.5.0
473-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Declarative.so.5.0.1
474-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DesignerComponents.so.5.0.1
475-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.so.5.0.0
476-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKit.so.5.0.1
477-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKit.so.5.0
478-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Qml.so.5.0
479-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Xml.so.5
480-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Widgets.so.5
481-usr/lib/x86_64-linux-gnu/qtcreator/qt5
482-usr/lib/x86_64-linux-gnu/qtcreator/qt5/libexec
483-usr/lib/x86_64-linux-gnu/qtcreator/qt5/libexec/QtWebPluginProcess
484-usr/lib/x86_64-linux-gnu/qtcreator/qt5/libexec/QtWebProcess
485-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin
486-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/uic
487-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/rcc
488-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/moc
489-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qml1plugindump
490-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/lrelease
491-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlprofiler
492-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/lconvert
493-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmake
494-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdbusviewer
495-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdbusxml2cpp
496-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdbuscpp2xml
497-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qhelpconverter
498-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/syncqt
499-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdbus
500-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/xmlpatterns
501-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qhelpgenerator
502-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlplugindump
503-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmltestrunner
504-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/lupdate
505-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qcollectiongenerator
506-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/designer
507-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/pixeltool
508-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlbundle
509-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlmin
510-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/linguist
511-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/assistant
512-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlviewer
513-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdoc
514-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/xmlpatternsvalidator
515-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml
516-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtSensors
517-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtSensors/qmldir
518-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtSensors/libdeclarative_sensors.so
519-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtSensors/plugins.qmltypes
520-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick.2
521-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick.2/qmldir
522-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick.2/libqtquick2plugin.so
523-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick.2/plugins.qmltypes
524-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu
525-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components
526-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/qmldir
527-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/PageStack.qml
528-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/AnimatedItem.qml
529-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/UbuntuShape.qml
530-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/sliderUtils.js
531-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups
532-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/qmldir
533-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/SheetBase.qml
534-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/Pointer.qml
535-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/Popover.qml
536-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/ubuntu-components-popups.qdoc
537-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/internalPopupUtils.js
538-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/Dialog.qml
539-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/DefaultSheet.qml
540-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/ComposerSheet.qml
541-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/popupUtils.js
542-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/PopupBase.qml
543-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Label.qml
544-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Page.qml
545-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ModelSectionCounter.qml
546-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/scrollbarUtils.js
547-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/mathUtils.js
548-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Tabs.qml
549-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Scrollbar.qml
550-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ActivityIndicator.qml
551-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/componentUtils.js
552-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/plugins.qmltypes
553-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/TextArea.qml
554-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Object.qml
555-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
556-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ActionList.qml
557-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Toolbar.qml
558-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ProgressBar.qml
559-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/TextField.qml
560-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/TextCustom.qml
561-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Action.qml
562-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Slider.qml
563-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ToolbarActions.qml
564-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/PageWrapperUtils.js
565-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/CheckBox.qml
566-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Button.qml
567-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork
568-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/ProgressBarTrackerIndeterminate@8.png
569-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/ActivityIndicator@8.png
570-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/ProgressBarTracker@8.png
571-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/back@18.png
572-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/ProgressBarBackground@8.png
573-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/ActivityIndicatorCentre@8.png
574-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/ActivityIndicatorMoving@8.png
575-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/MainView.qml
576-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Header.qml
577-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/TabButton.qml
578-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/fontUtils.js
579-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/stack.js
580-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems
581-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/qmldir
582-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ValueSelector.qml
583-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/MultiValue.qml
584-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Base.qml
585-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/SingleValue.qml
586-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/SingleControl.qml
587-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Standard.qml
588-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Divider.qml
589-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ubuntu-components-listitems.qdoc
590-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ImageWithFallback.qml
591-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Subtitled.qml
592-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Empty.qml
593-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork
594-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/ListItemDivider6px@8.png
595-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/ListItemDivider24px@8.png
596-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/ListItemProgressionArrow@8.png
597-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/ListItemDividerVertical@18.png
598-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/ListItemDividerHorizontal@18.png
599-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Header.qml
600-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ProgressionVisual.qml
601-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/IconVisual.qml
602-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ThinDivider.qml
603-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Caption.qml
604-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/LabelVisual.qml
605-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/DraggingArea.qml
606-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Tab.qml
607-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/PageWrapper.qml
608-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Switch.qml
609-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/GenericToolbar.qml
610-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/AbstractButton.qml
611-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest
612-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/qmldir
613-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/testlogger.js
614-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/TestCase.qml
615-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/plugins.qmltypes
616-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/libqmltestplugin.so
617-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/SignalSpy.qml
618-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtLocation
619-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtLocation/qmldir
620-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtLocation/libdeclarative_location.so
621-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtLocation/plugins.qmltypes
622-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick
623-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick/XmlListModel
624-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick/XmlListModel/qmldir
625-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick/XmlListModel/plugins.qmltypes
626-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so
627-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins
628-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/geoservices
629-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/geoservices/libqtgeoservices_nokia.so
630-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/bearer
631-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/bearer/libqnmbearer.so
632-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/bearer/libqconnmanbearer.so
633-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/bearer/libqgenericbearer.so
634-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/printsupport
635-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/printsupport/libcupsprintersupport.so
636-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic
637-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic/libqevdevtouchplugin.so
638-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic/libqevdevmouseplugin.so
639-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic/libqevdevkeyboardplugin.so
640-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic/libqevdevtabletplugin.so
641-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/imageformats
642-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/imageformats/libqico.so
643-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/imageformats/libqgif.so
644-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/imageformats/libqjpeg.so
645-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sqldrivers
646-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sqldrivers/libqsqlite.so
647-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling
648-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling/libqmldbg_qtquick2.so
649-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so
650-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling/libqmldbg_inspector.so
651-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling/libqmldbg_tcp.so
652-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforminputcontexts
653-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.so
654-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
655-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/accessible
656-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/accessible/libqtaccessiblequick.so
657-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/accessible/libqtaccessiblewidgets.so
658-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforms
659-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforms/libqlinuxfb.so
660-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforms/libqxcb.so
661-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforms/libqminimal.so
662-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/position
663-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/position/libqtposition_geoclue.so
664-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensors
665-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensors/libqtsensors_generic.so
666-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensors/libqtsensors_dummy.so
667-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensors/libqtsensors_linuxsys.so
668-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensorgestures
669-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensorgestures/libqtsensorgestures_plugin.so
670-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensorgestures/libqtsensorgestures_shakeplugin.so
671-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensorgestures/libqtsensorgestures_counterplugin.so
672-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports
673-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt
674-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs
675-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/gestures
676-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/gestures/qmldir
677-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/gestures/plugins.qmltypes
678-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/gestures/libqmlgesturesplugin.so
679-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/shaders
680-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/shaders/qmldir
681-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/shaders/plugins.qmltypes
682-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/shaders/libqmlshadersplugin.so
683-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/folderlistmodel
684-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/folderlistmodel/qmldir
685-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
686-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/folderlistmodel/plugins.qmltypes
687-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/particles
688-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/particles/qmldir
689-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/particles/libqmlparticlesplugin.so
690-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/particles/plugins.qmltypes
691-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/QtWebKit
692-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/QtWebKit/qmldir
693-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/QtWebKit/plugins.qmltypes
694-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/QtWebKit/libqmlwebkitplugin.so
695-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/builtins.qmltypes
696-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Test.so.5
697-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.so.5
698-usr/lib/x86_64-linux-gnu/qtcreator/libQt5ScriptTools.so
699-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Designer.so
700-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKit.so.5
701-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Widgets.so.5.0.1
702-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickParticles.so.5.0
703
704=== removed file 'qt5libs/debian/ubuntu-qtcreator-qt5libs.install'
705--- qt5libs/debian/ubuntu-qtcreator-qt5libs.install 2013-02-15 16:04:20 +0000
706+++ qt5libs/debian/ubuntu-qtcreator-qt5libs.install 1970-01-01 00:00:00 +0000
707@@ -1,2 +0,0 @@
708-usr/lib/*/qtcreator
709-usr/bin
710
711=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot'
712=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/Makefile'
713--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/Makefile 2013-05-03 23:00:15 +0000
714+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/Makefile 1970-01-01 00:00:00 +0000
715@@ -1,3 +0,0 @@
716-check:
717- cd tests
718- autopilot run qmluitests
719
720=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/helloworld.qml'
721--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/helloworld.qml 2013-02-14 11:31:47 +0000
722+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/helloworld.qml 1970-01-01 00:00:00 +0000
723@@ -1,37 +0,0 @@
724-import QtQuick 2.0
725-import Ubuntu.Components 0.1
726-
727-/*!
728- \brief A Hello World application with a functional tests with autopilot-qt
729-*/
730-
731-MainView {
732- // objectName for functional testing purposes (autopilot-qt5)
733- objectName: "mainView"
734-
735- width: units.gu(100)
736- height: units.gu(75)
737-
738- Column {
739- anchors.centerIn: parent
740- width: units.gu(40)
741- spacing: units.gu(2)
742-
743- Label {
744- id: label
745- objectName: "label"
746-
747- text: "Hello.."
748- }
749- Button {
750- objectName: "button"
751- width: parent.width
752-
753- text: "Tap me!"
754-
755- onClicked: {
756- label.text = "..world!"
757- }
758- }
759- }
760-}
761
762=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests'
763=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests'
764=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic'
765=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/__init__.py'
766--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/__init__.py 2013-02-14 11:31:47 +0000
767+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/__init__.py 1970-01-01 00:00:00 +0000
768@@ -1,1 +0,0 @@
769-""" A Generic test suite """
770
771=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/test_helloworld.py'
772--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/test_helloworld.py 2013-05-03 23:00:15 +0000
773+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/test_helloworld.py 1970-01-01 00:00:00 +0000
774@@ -1,39 +0,0 @@
775-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
776-
777-"""Tests for the Hello World"""
778-
779-from autopilot.matchers import Eventually
780-from textwrap import dedent
781-from testtools.matchers import Is, Not, Equals
782-from testtools import skip
783-import os
784-from tests import HelloWorldTestCase
785-
786-
787-class GenericTests(HelloWorldTestCase):
788- """Generic tests for the Hello World"""
789-
790- test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../helloworld")
791-
792- def test_can_select_mainView(self):
793- """Must be able to select the button."""
794-
795- mainView = self.app.select_single('MainView')
796- self.assertThat(mainView, Not(Is(None)))
797- self.assertThat(mainView.visible,Eventually(Equals(True)))
798-
799- def test_can_tap_button(self):
800- """Must be able to tap the button"""
801-
802- lbl = self.app.select_single(objectName="label")
803- self.assertThat(lbl, Not(Is(None)))
804-
805- btn = self.app.select_single(objectName="button")
806- self.assertThat(btn, Not(Is(None)))
807- self.assertThat(btn.visible, Eventually(Equals(True)))
808-
809- self.mouse.move_to_object(btn)
810- self.mouse.click()
811-
812- self.assertThat(lbl.text, Eventually(Equals("..world!")))
813-
814
815=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/__init__.py'
816--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/__init__.py 2013-05-03 23:00:15 +0000
817+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/__init__.py 1970-01-01 00:00:00 +0000
818@@ -1,54 +0,0 @@
819-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
820-
821-"""Hello World autopilot tests."""
822-
823-from os import remove
824-import os.path
825-from tempfile import mktemp
826-
827-from autopilot.matchers import Eventually
828-from testtools.matchers import Is, Not, Equals
829-from autopilot.introspection.qt import QtIntrospectionTestMixin
830-from autopilot.testcase import AutopilotTestCase
831-
832-
833-def get_module_include_path():
834- return os.path.abspath(
835- os.path.join(
836- os.path.dirname(__file__),
837- '..',
838- '..',
839- '..',
840- '..',
841- 'modules')
842- )
843-
844-
845-class HelloWorldTestCase(AutopilotTestCase, QtIntrospectionTestMixin):
846-
847- """A common test case class that provides several useful methods for the HelloWorld tests."""
848-
849- def setUp(self):
850- super(HelloWorldTestCase, self).setUp()
851- self.launch_test_qml()
852-
853- def launch_test_qml(self):
854- # If the test class has defined a 'test_qml' class attribute then we
855- # write it to disk and launch it inside the Qml Viewer. If not, then we
856- # silently do nothing (presumably the test has something else planned).
857- if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
858- qml_path = mktemp(suffix='.qml')
859- open(qml_path, 'w').write(self.test_qml)
860- self.addCleanup(remove, qml_path)
861-
862- self.app = self.launch_test_application(
863- "qmlscene",
864- "-I", get_module_include_path(),
865- qml_path)
866-
867- if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
868- qml_path = self.test_qml_file
869- self.app = self.launch_test_application(
870- "qmlscene",
871- "-I", get_module_include_path(),
872- qml_path)
873
874=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/tabs/toolbarIcon@8.png'
875Binary files qtcreator/share/qtcreator/templates/wizards/ubuntu/tabs/toolbarIcon@8.png 2013-04-24 06:10:16 +0000 and qtcreator/share/qtcreator/templates/wizards/ubuntu/tabs/toolbarIcon@8.png 1970-01-01 00:00:00 +0000 differ
876=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/unit'
877=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/Makefile'
878--- qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/Makefile 2013-05-03 23:00:15 +0000
879+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/Makefile 1970-01-01 00:00:00 +0000
880@@ -1,2 +0,0 @@
881-check:
882- qmltestrunner
883
884=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/tst_test.qml'
885--- qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/tst_test.qml 2013-05-03 23:00:15 +0000
886+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/tst_test.qml 1970-01-01 00:00:00 +0000
887@@ -1,43 +0,0 @@
888-import QtQuick 2.0
889-import QtTest 1.0
890-import Ubuntu.Components 0.1
891-
892-// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
893-
894-Item {
895- // The objects
896- Button {
897- id: objectUnderTest
898- }
899-
900- TestCase {
901- name: "testCase1"
902- when: windowShown
903-
904- function init() {
905- console.debug(">> init");
906- console.debug("<< init");
907- }
908-
909- function cleanup() {
910- console.debug(">> cleanup");
911- console.debug("<< cleanup");
912- }
913-
914- function initTestCase() {
915- console.debug(">> initTestCase");
916- console.debug("<< initTestCase");
917- }
918-
919- function cleanupTestCase() {
920- console.debug(">> cleanupTestCase");
921- console.debug("<< cleanupTestCase");
922- }
923-
924- function test_exampleTest1() {
925- var expected = true;
926- var result = true;
927- compare(expected,result,"expected did not equal result");
928- }
929- }
930-}
931
932=== renamed directory 'qtcreator' => 'ubuntu-qtcreator-plugins'
933=== added directory 'ubuntu-qtcreator-plugins/debian'
934=== added file 'ubuntu-qtcreator-plugins/debian/qtcreator-plugin-ubuntu.install'
935--- ubuntu-qtcreator-plugins/debian/qtcreator-plugin-ubuntu.install 1970-01-01 00:00:00 +0000
936+++ ubuntu-qtcreator-plugins/debian/qtcreator-plugin-ubuntu.install 2013-06-10 18:40:33 +0000
937@@ -0,0 +1,4 @@
938+debian/ubuntusdk.desktop usr/share/applications
939+usr/share/qtcreator/templates/wizards/ubuntu
940+usr/share/qtcreator/ubuntu
941+usr/lib/*/qtcreator/plugins/Canonical
942
943=== added file 'ubuntu-qtcreator-plugins/debian/qtcreator.desktop'
944--- ubuntu-qtcreator-plugins/debian/qtcreator.desktop 1970-01-01 00:00:00 +0000
945+++ ubuntu-qtcreator-plugins/debian/qtcreator.desktop 2013-06-10 18:40:33 +0000
946@@ -0,0 +1,10 @@
947+[Desktop Entry]
948+Exec=qtcreator -noload Ubuntu %F
949+Icon=QtProject-qtcreator
950+Type=Application
951+Terminal=false
952+Name=Qt Creator
953+GenericName=Integrated Development Environment
954+MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;
955+Categories=Qt;Development;IDE;
956+InitialPreference=9
957
958=== added file 'ubuntu-qtcreator-plugins/debian/ubuntusdk.desktop'
959--- ubuntu-qtcreator-plugins/debian/ubuntusdk.desktop 1970-01-01 00:00:00 +0000
960+++ ubuntu-qtcreator-plugins/debian/ubuntusdk.desktop 2013-06-10 18:40:33 +0000
961@@ -0,0 +1,11 @@
962+[Desktop Entry]
963+Exec=qtcreator -noload Welcome %F
964+Icon=QtProject-qtcreator
965+Type=Application
966+Terminal=false
967+Name=Ubuntu SDK
968+GenericName=Integrated Development Environment
969+MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;
970+Categories=Qt;Development;IDE;
971+InitialPreference=9
972+Keywords=Ubuntu SDK;SDK;Ubuntu Touch
973
974=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/static.pro'
975--- ubuntu-qtcreator-plugins/share/qtcreator/static.pro 1970-01-01 00:00:00 +0000
976+++ ubuntu-qtcreator-plugins/share/qtcreator/static.pro 2013-06-10 18:40:33 +0000
977@@ -0,0 +1,126 @@
978+include(../../qtcreator.pri)
979+
980+TEMPLATE = app
981+TARGET = phony_target
982+CONFIG -= qt separate_debug_info gdb_dwarf_index
983+QT =
984+LIBS =
985+macx:CONFIG -= app_bundle
986+
987+isEmpty(vcproj) {
988+ QMAKE_LINK = @: IGNORE THIS LINE
989+ OBJECTS_DIR =
990+ win32:CONFIG -= embed_manifest_exe
991+} else {
992+ CONFIG += console
993+ PHONY_DEPS = .
994+ phony_src.input = PHONY_DEPS
995+ phony_src.output = phony.c
996+ phony_src.variable_out = GENERATED_SOURCES
997+ phony_src.commands = echo int main() { return 0; } > phony.c
998+ phony_src.name = CREATE phony.c
999+ phony_src.CONFIG += combine
1000+ QMAKE_EXTRA_COMPILERS += phony_src
1001+}
1002+
1003+DATA_DIRS = \
1004+ welcomescreen \
1005+ examplebrowser \
1006+ snippets \
1007+ templates \
1008+ designer \
1009+ schemes \
1010+ styles \
1011+ rss \
1012+ dumper \
1013+ qmldesigner \
1014+ qmlicons \
1015+ qml \
1016+ qml-type-descriptions \
1017+ generic-highlighter \
1018+ glsl \
1019+ ubuntu
1020+
1021+macx: DATA_DIRS += scripts
1022+
1023+for(data_dir, DATA_DIRS) {
1024+ files = $$files($$PWD/$$data_dir/*, true)
1025+ win32:files ~= s|\\\\|/|g
1026+ for(file, files):!contains(file, ".*/Info\\.plist\\.in$"):!exists($$file/*):FILES += $$file
1027+}
1028+OTHER_FILES += $$FILES
1029+
1030+# conditionally deployed data
1031+!isEmpty(copydata) {
1032+ copy2build.input = FILES
1033+ copy2build.output = $$IDE_DATA_PATH/${QMAKE_FUNC_FILE_IN_stripSrcDir}
1034+ isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
1035+ win32:copy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
1036+ unix:copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
1037+ copy2build.name = COPY ${QMAKE_FILE_IN}
1038+ copy2build.CONFIG += no_link
1039+ QMAKE_EXTRA_COMPILERS += copy2build
1040+}
1041+
1042+!macx {
1043+ for(data_dir, DATA_DIRS) {
1044+ eval($${data_dir}.files = $$quote($$PWD/$$data_dir))
1045+ eval($${data_dir}.path = $$QTC_PREFIX/share/qtcreator)
1046+ INSTALLS += $$data_dir
1047+ }
1048+} else {
1049+ # do version magic for app bundles
1050+ dumpinfo.input = qml/qmldump/Info.plist.in
1051+ dumpinfo.output = $$IDE_DATA_PATH/qml/qmldump/Info.plist
1052+ QMAKE_SUBSTITUTES += dumpinfo
1053+ observerinfo.input = qml/qmlobserver/Info.plist.in
1054+ observerinfo.output = $$IDE_DATA_PATH/qml/qmlobserver/Info.plist
1055+ QMAKE_SUBSTITUTES += observerinfo
1056+}
1057+
1058+SRCRESOURCEDIR = $$IDE_SOURCE_TREE/src/share/qtcreator/
1059+defineReplace(stripSrcResourceDir) {
1060+ win32 {
1061+ !contains(1, ^.:.*):1 = $$OUT_PWD/$$1
1062+ } else {
1063+ !contains(1, ^/.*):1 = $$OUT_PWD/$$1
1064+ }
1065+ out = $$cleanPath($$1)
1066+ out ~= s|^$$re_escape($$SRCRESOURCEDIR)||$$i_flag
1067+ return($$out)
1068+}
1069+
1070+# files that are to be unconditionally "deployed" to the build dir from src/share to share
1071+DATA_DIRS = \
1072+ externaltools
1073+DATA_FILES_SRC = \
1074+ externaltools/lrelease.xml \
1075+ externaltools/lupdate.xml \
1076+ externaltools/sort.xml \
1077+ externaltools/qmlviewer.xml \
1078+ externaltools/qmlscene.xml
1079+unix {
1080+ macx:DATA_FILES_SRC += externaltools/vi_mac.xml
1081+ else:DATA_FILES_SRC += externaltools/vi.xml
1082+} else {
1083+ DATA_FILES_SRC += externaltools/notepad_win.xml
1084+}
1085+for(file, DATA_FILES_SRC):DATA_FILES += $${SRCRESOURCEDIR}$$file
1086+OTHER_FILES += $$DATA_FILES
1087+unconditionalCopy2build.input = DATA_FILES
1088+unconditionalCopy2build.output = $$IDE_DATA_PATH/${QMAKE_FUNC_FILE_IN_stripSrcResourceDir}
1089+isEmpty(vcproj):unconditionalCopy2build.variable_out = PRE_TARGETDEPS
1090+win32:unconditionalCopy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
1091+unix:unconditionalCopy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
1092+unconditionalCopy2build.name = COPY ${QMAKE_FILE_IN}
1093+unconditionalCopy2build.CONFIG += no_link
1094+QMAKE_EXTRA_COMPILERS += unconditionalCopy2build
1095+
1096+!macx {
1097+ for(data_dir, DATA_DIRS) {
1098+ eval($${data_dir}.files = $$IDE_DATA_PATH/$$data_dir)
1099+ eval($${data_dir}.path = $$QTC_PREFIX/share/qtcreator)
1100+ eval($${data_dir}.CONFIG += no_check_exist)
1101+ INSTALLS += $$data_dir
1102+ }
1103+}
1104
1105=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/backend/backend.h'
1106--- qtcreator/share/qtcreator/templates/wizards/ubuntu/backend/backend.h 2013-04-23 14:15:56 +0000
1107+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/backend/backend.h 2013-06-10 18:40:33 +0000
1108@@ -4,6 +4,27 @@
1109 #include <QtQml/QQmlEngine>
1110 #include <QtQml/QQmlExtensionPlugin>
1111
1112+/*
1113+ ----8<-----
1114+
1115+ import %DISPLAYNAME% 1.0
1116+
1117+ Rectangle {
1118+ width: 200
1119+ height: 200
1120+
1121+ MyType {
1122+ id: helloType
1123+ }
1124+
1125+ Text {
1126+ anchors.centerIn: parent
1127+ text: helloType.helloworld
1128+ }
1129+ }
1130+
1131+ -----8<------
1132+*/
1133 class BackendPlugin : public QQmlExtensionPlugin
1134 {
1135 Q_OBJECT
1136
1137=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json'
1138--- qtcreator/share/qtcreator/templates/wizards/ubuntu/projectypes.json 2013-05-03 23:00:15 +0000
1139+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json 2013-06-10 18:40:33 +0000
1140@@ -6,9 +6,28 @@
1141 "id": "UbuntuAppSimple",
1142 "description": "A simple Ubuntu UI with a Label and a Button",
1143 "mainFile" : "main.qml",
1144+ "hasTests" : true,
1145 "files": [
1146 {
1147 "fileName": "displayName.desktop"
1148+ },
1149+ {
1150+ "fileName": "tests/unit/tst_hellocomponent.qml"
1151+ },
1152+ {
1153+ "fileName": "components/HelloComponent.qml"
1154+ },
1155+ {
1156+ "fileName": "Makefile"
1157+ },
1158+ {
1159+ "fileName": "tests/autopilot/uitests/main/test_main.py"
1160+ },
1161+ {
1162+ "fileName": "tests/autopilot/uitests/__init__.py"
1163+ },
1164+ {
1165+ "fileName": "tests/autopilot/uitests/main/__init__.py"
1166 }
1167 ]
1168 },
1169@@ -19,12 +38,40 @@
1170 "id": "UbuntuAppTabs",
1171 "description": "A multi-page UI using the Tabs component",
1172 "mainFile" : "main.qml",
1173+ "hasTests" : true,
1174 "files": [
1175 {
1176- "fileName": "toolbarIcon@8.png"
1177+ "fileName": "graphics/toolbarIcon@8.png"
1178 },
1179 {
1180 "fileName": "displayName.desktop"
1181+ },
1182+ {
1183+ "fileName": "tests/unit/tst_hellocomponent.qml"
1184+ },
1185+ {
1186+ "fileName": "components/HelloComponent.qml"
1187+ },
1188+ {
1189+ "fileName": "ui/WorldTabTools.qml"
1190+ },
1191+ {
1192+ "fileName": "ui/WorldTab.qml"
1193+ },
1194+ {
1195+ "fileName": "ui/HelloTab.qml"
1196+ },
1197+ {
1198+ "fileName": "Makefile"
1199+ },
1200+ {
1201+ "fileName": "tests/autopilot/uitests/main/test_main.py"
1202+ },
1203+ {
1204+ "fileName": "tests/autopilot/uitests/__init__.py"
1205+ },
1206+ {
1207+ "fileName": "tests/autopilot/uitests/main/__init__.py"
1208 }
1209 ]
1210 },
1211@@ -60,40 +107,5 @@
1212 { "fileName": "mytype.cpp" },
1213 { "fileName": "qmldir" }
1214 ]
1215- },
1216- {
1217- "type": "qmlproject",
1218- "folder": "unit",
1219- "displayName": "Unit Test with QML",
1220- "id": "UbuntuTestQML",
1221- "description": "A QML based unit test case template",
1222- "mainFile" : "tst_test.qml",
1223- "files": [
1224- {
1225- "fileName": "Makefile"
1226- }
1227- ]
1228- },
1229- {
1230- "type": "autopilotproject",
1231- "folder": "autopilot",
1232- "displayName": "Functional Tests with Autopilot",
1233- "id": "UbuntuTestAutopilot",
1234- "description": "A Python based functional test case template for a simple QML UI",
1235- "mainFile" : "helloworld.qml",
1236- "files": [
1237- {
1238- "fileName": "Makefile"
1239- },
1240- {
1241- "fileName": "tests/qmluitests/Generic/test_helloworld.py"
1242- },
1243- {
1244- "fileName": "tests/qmluitests/__init__.py"
1245- },
1246- {
1247- "fileName": "tests/qmluitests/Generic/__init__.py"
1248- }
1249- ]
1250 }
1251 ]
1252
1253=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/Makefile'
1254--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/Makefile 1970-01-01 00:00:00 +0000
1255+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/Makefile 2013-06-10 18:40:33 +0000
1256@@ -0,0 +1,18 @@
1257+# More information: https://wiki.ubuntu.com/Touch/Testing
1258+#
1259+# Notes for autopilot tests:
1260+# -----------------------------------------------------------
1261+# In order to run autopilot tests:
1262+# sudo apt-add-repository ppa:autopilot/ppa
1263+# sudo apt-get update
1264+# sudo apt-get install python-autopilot autopilot-qt
1265+#############################################################
1266+
1267+autopilot:
1268+ cd tests/autopilot; autopilot run uitests
1269+
1270+check:
1271+ qmltestrunner -input tests/unit
1272+
1273+run:
1274+ /usr/bin/qmlscene $@ %DISPLAYNAME%.qml
1275
1276=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/components'
1277=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml'
1278--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml 1970-01-01 00:00:00 +0000
1279+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml 2013-06-10 18:40:33 +0000
1280@@ -0,0 +1,14 @@
1281+import QtQuick 2.0
1282+import Ubuntu.Components 0.1
1283+
1284+UbuntuShape {
1285+ width: 200
1286+ height: width
1287+
1288+ property alias text : myText.text
1289+
1290+ Label {
1291+ id: myText
1292+ anchors.centerIn: parent
1293+ }
1294+}
1295
1296=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/main.qml'
1297--- qtcreator/share/qtcreator/templates/wizards/ubuntu/simple/main.qml 2013-05-03 21:22:40 +0000
1298+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/main.qml 2013-06-10 18:40:33 +0000
1299@@ -1,5 +1,6 @@
1300 import QtQuick 2.0
1301 import Ubuntu.Components 0.1
1302+import "components"
1303
1304 /*!
1305 \brief MainView with a Label and Button elements.
1306@@ -16,7 +17,7 @@
1307 This property enables the application to change orientation
1308 when the device is rotated. The default is false.
1309 */
1310- automaticOrientation: true
1311+ //automaticOrientation: true
1312
1313 width: units.gu(100)
1314 height: units.gu(75)
1315@@ -31,12 +32,13 @@
1316 fill: parent
1317 }
1318
1319- Label {
1320+ HelloComponent {
1321 id: label
1322 objectName: "label"
1323
1324 text: i18n.tr("Hello..")
1325 }
1326+
1327 Button {
1328 objectName: "button"
1329 width: parent.width
1330
1331=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests'
1332=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot'
1333=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests'
1334=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/__init__.py'
1335--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/__init__.py 1970-01-01 00:00:00 +0000
1336+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/__init__.py 2013-06-10 18:40:33 +0000
1337@@ -0,0 +1,129 @@
1338+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1339+
1340+"""Ubuntu Touch App autopilot tests."""
1341+
1342+from os import remove
1343+import os.path
1344+from tempfile import mktemp
1345+import subprocess
1346+
1347+from autopilot.input import Mouse, Touch, Pointer
1348+from autopilot.matchers import Eventually
1349+from autopilot.platform import model
1350+from testtools.matchers import Is, Not, Equals
1351+from autopilot.testcase import AutopilotTestCase
1352+
1353+def get_module_include_path():
1354+ return os.path.abspath(
1355+ os.path.join(
1356+ os.path.dirname(__file__),
1357+ '..',
1358+ '..',
1359+ '..',
1360+ '..',
1361+ 'modules')
1362+ )
1363+
1364+
1365+class UbuntuTouchAppTestCase(AutopilotTestCase):
1366+ """A common test case class that provides several useful methods for the tests."""
1367+
1368+ if model() == 'Desktop':
1369+ scenarios = [
1370+ ('with mouse', dict(input_device_class=Mouse))
1371+ ]
1372+ else:
1373+ scenarios = [
1374+ ('with touch', dict(input_device_class=Touch))
1375+ ]
1376+
1377+ @property
1378+ def main_window(self):
1379+ return MainWindow(self.app)
1380+
1381+
1382+ def setUp(self):
1383+ self.pointing_device = Pointer(self.input_device_class.create())
1384+ super(UbuntuTouchAppTestCase, self).setUp()
1385+ self.launch_test_qml()
1386+
1387+
1388+ def launch_test_qml(self):
1389+ # If the test class has defined a 'test_qml' class attribute then we
1390+ # write it to disk and launch it inside the QML Scene. If not, then we
1391+ # silently do nothing (presumably the test has something else planned).
1392+ arch = subprocess.check_output(["dpkg-architecture",
1393+ "-qDEB_HOST_MULTIARCH"]).strip()
1394+ if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
1395+ qml_path = mktemp(suffix='.qml')
1396+ open(qml_path, 'w').write(self.test_qml)
1397+ self.addCleanup(remove, qml_path)
1398+
1399+ self.app = self.launch_test_application(
1400+ "/usr/lib/" + arch + "/qt5/bin/qmlscene",
1401+ "-I", get_module_include_path(),
1402+ qml_path)
1403+
1404+ if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
1405+ qml_path = self.test_qml_file
1406+ self.app = self.launch_test_application(
1407+ "/usr/lib/" + arch + "/qt5/bin/qmlscene",
1408+ "-I", get_module_include_path(),
1409+ qml_path)
1410+
1411+ self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
1412+
1413+
1414+ def get_qml_view(self):
1415+ """Get the main QML view"""
1416+
1417+ return self.app.select_single("QQuickView")
1418+
1419+ def get_mainview(self):
1420+ """Get the QML MainView"""
1421+
1422+ mainView = self.app.select_single("MainView")
1423+ self.assertThat(mainView, Not(Is(None)))
1424+ return mainView
1425+
1426+
1427+ def get_object(self,objectName):
1428+ """Get a object based on the objectName"""
1429+
1430+ obj = self.app.select_single(objectName=objectName)
1431+ self.assertThat(obj, Not(Is(None)))
1432+ return obj
1433+
1434+
1435+ def mouse_click(self,objectName):
1436+ """Move mouse on top of the object and click on it"""
1437+
1438+ obj = self.get_object(objectName)
1439+ self.pointing_device.move_to_object(obj)
1440+ self.pointing_device.click()
1441+
1442+
1443+ def mouse_press(self,objectName):
1444+ """Move mouse on top of the object and press mouse button (without releasing it)"""
1445+
1446+ obj = self.get_object(objectName)
1447+ self.pointing_device.move_to_object(obj)
1448+ self.pointing_device.press()
1449+
1450+
1451+ def mouse_release(self):
1452+ """Release mouse button"""
1453+
1454+ self.pointing_device.release()
1455+
1456+
1457+ def type_string(self, string):
1458+ """Type a string with keyboard"""
1459+
1460+ self.keyboard.type(string)
1461+
1462+
1463+ def type_key(self, key):
1464+ """Type a single key with keyboard"""
1465+
1466+ self.keyboard.key(key)
1467
1468=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main'
1469=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/__init__.py'
1470--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/__init__.py 1970-01-01 00:00:00 +0000
1471+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/__init__.py 2013-06-10 18:40:33 +0000
1472@@ -0,0 +1,1 @@
1473+""" A Generic test suite """
1474
1475=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/test_main.py'
1476--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/test_main.py 1970-01-01 00:00:00 +0000
1477+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/test_main.py 2013-06-10 18:40:33 +0000
1478@@ -0,0 +1,38 @@
1479+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1480+
1481+"""Tests for the Hello World"""
1482+
1483+from autopilot.matchers import Eventually
1484+from textwrap import dedent
1485+from testtools.matchers import Is, Not, Equals
1486+from testtools import skip
1487+import os
1488+from uitests import HelloWorldTestCase
1489+
1490+
1491+class GenericTests(HelloWorldTestCase):
1492+ """Generic tests for the Hello World"""
1493+
1494+ test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../%DISPLAYNAME%")
1495+
1496+ def test_0_can_select_mainView(self):
1497+ """Must be able to select the mainview."""
1498+
1499+ mainView = self.get_mainview()
1500+ self.assertThat(mainView.visible,Eventually(Equals(True)))
1501+
1502+
1503+ def test_1_init_label(self):
1504+ """Check the initial text of the label"""
1505+
1506+ lbl = self.get_object(objectName="label")
1507+ self.assertThat(lbl.text, Equals("Hello.."))
1508+
1509+
1510+ def test_can_tap_button(self):
1511+ """Must be able to tap the button"""
1512+
1513+ lbl = self.get_object(objectName="label")
1514+ self.mouse_click(objectName="button")
1515+ self.assertThat(lbl.text, Eventually(Equals("..world!")))
1516+
1517
1518=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/unit'
1519=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/unit/tst_hellocomponent.qml'
1520--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/unit/tst_hellocomponent.qml 1970-01-01 00:00:00 +0000
1521+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/unit/tst_hellocomponent.qml 2013-06-10 18:40:33 +0000
1522@@ -0,0 +1,49 @@
1523+import QtQuick 2.0
1524+import QtTest 1.0
1525+import Ubuntu.Components 0.1
1526+import "../../components"
1527+
1528+// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
1529+
1530+// Execute tests with:
1531+// qmltestrunner
1532+
1533+Item {
1534+ // The objects
1535+ HelloComponent {
1536+ id: objectUnderTest
1537+ }
1538+
1539+ TestCase {
1540+ name: "HelloComponent"
1541+
1542+ function init() {
1543+ console.debug(">> init");
1544+ compare("",objectUnderTest.text,"text was not empty on init");
1545+ console.debug("<< init");
1546+ }
1547+
1548+ function cleanup() {
1549+ console.debug(">> cleanup");
1550+ console.debug("<< cleanup");
1551+ }
1552+
1553+ function initTestCase() {
1554+ console.debug(">> initTestCase");
1555+ console.debug("<< initTestCase");
1556+ }
1557+
1558+ function cleanupTestCase() {
1559+ console.debug(">> cleanupTestCase");
1560+ console.debug("<< cleanupTestCase");
1561+ }
1562+
1563+ function test_canReadAndWriteText() {
1564+ var expected = "Hello World";
1565+
1566+ objectUnderTest.text = expected;
1567+
1568+ compare(expected,objectUnderTest.text,"expected did not equal result");
1569+ }
1570+ }
1571+}
1572
1573=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/Makefile'
1574--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/Makefile 1970-01-01 00:00:00 +0000
1575+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/Makefile 2013-06-10 18:40:33 +0000
1576@@ -0,0 +1,18 @@
1577+# More information: https://wiki.ubuntu.com/Touch/Testing
1578+#
1579+# Notes for autopilot tests:
1580+# -----------------------------------------------------------
1581+# In order to run autopilot tests:
1582+# sudo apt-add-repository ppa:autopilot/ppa
1583+# sudo apt-get update
1584+# sudo apt-get install python-autopilot autopilot-qt
1585+#############################################################
1586+
1587+autopilot:
1588+ cd tests/autopilot; autopilot run uitests
1589+
1590+check:
1591+ qmltestrunner -input tests/unit
1592+
1593+run:
1594+ /usr/bin/qmlscene $@ %DISPLAYNAME%.qml
1595
1596=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/components'
1597=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/components/HelloComponent.qml'
1598--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/components/HelloComponent.qml 1970-01-01 00:00:00 +0000
1599+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/components/HelloComponent.qml 2013-06-10 18:40:33 +0000
1600@@ -0,0 +1,14 @@
1601+import QtQuick 2.0
1602+import Ubuntu.Components 0.1
1603+
1604+UbuntuShape {
1605+ width: 200
1606+ height: width
1607+
1608+ property alias text : myText.text
1609+
1610+ Label {
1611+ id: myText
1612+ anchors.centerIn: parent
1613+ }
1614+}
1615
1616=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/graphics'
1617=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/graphics/toolbarIcon@8.png'
1618Binary files ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/graphics/toolbarIcon@8.png 1970-01-01 00:00:00 +0000 and ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/graphics/toolbarIcon@8.png 2013-06-10 18:40:33 +0000 differ
1619=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/main.qml'
1620--- qtcreator/share/qtcreator/templates/wizards/ubuntu/tabs/main.qml 2013-04-26 17:51:04 +0000
1621+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/main.qml 2013-06-10 18:40:33 +0000
1622@@ -1,5 +1,6 @@
1623 import QtQuick 2.0
1624 import Ubuntu.Components 0.1
1625+import "ui"
1626
1627 /*!
1628 \brief MainView with Tabs element.
1629@@ -18,7 +19,7 @@
1630 This property enables the application to change orientation
1631 when the device is rotated. The default is false.
1632 */
1633- automaticOrientation: true
1634+ //automaticOrientation: true
1635
1636 width: units.gu(100)
1637 height: units.gu(75)
1638@@ -26,52 +27,12 @@
1639 Tabs {
1640 id: tabs
1641
1642- // First tab begins here
1643- Tab {
1644- objectName: "Tab1"
1645-
1646- title: i18n.tr("Hello..")
1647-
1648- // Tab content begins here
1649- page: Page {
1650- Column {
1651- anchors.centerIn: parent
1652- Label {
1653- text: i18n.tr("Swipe from right to left to change tab.")
1654- }
1655- }
1656- }
1657+ HelloTab {
1658+ objectName: "helloTab"
1659 }
1660
1661- // Second tab begins here
1662- Tab {
1663- objectName: "Tab2"
1664-
1665- title: i18n.tr("..Toolbar!")
1666- page: Page {
1667- tools: ToolbarActions {
1668- Action {
1669- objectName: "action"
1670-
1671- iconSource: Qt.resolvedUrl("toolbarIcon.png")
1672- text: i18n.tr("Tap me!")
1673-
1674- onTriggered: {
1675- label.text = i18n.tr("Toolbar tapped")
1676- }
1677- }
1678- }
1679-
1680- Column {
1681- anchors.centerIn: parent
1682- Label {
1683- id: label
1684- objectName: "label"
1685-
1686- text: i18n.tr("Swipe from bottom to up to reveal the toolbar.")
1687- }
1688- }
1689- }
1690+ WorldTab {
1691+ objectName: "worldTab"
1692 }
1693 }
1694 }
1695
1696=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests'
1697=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot'
1698=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests'
1699=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/__init__.py'
1700--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/__init__.py 1970-01-01 00:00:00 +0000
1701+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/__init__.py 2013-06-10 18:40:33 +0000
1702@@ -0,0 +1,129 @@
1703+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1704+
1705+"""Ubuntu Touch App autopilot tests."""
1706+
1707+from os import remove
1708+import os.path
1709+from tempfile import mktemp
1710+import subprocess
1711+
1712+from autopilot.input import Mouse, Touch, Pointer
1713+from autopilot.matchers import Eventually
1714+from autopilot.platform import model
1715+from testtools.matchers import Is, Not, Equals
1716+from autopilot.testcase import AutopilotTestCase
1717+
1718+def get_module_include_path():
1719+ return os.path.abspath(
1720+ os.path.join(
1721+ os.path.dirname(__file__),
1722+ '..',
1723+ '..',
1724+ '..',
1725+ '..',
1726+ 'modules')
1727+ )
1728+
1729+
1730+class UbuntuTouchAppTestCase(AutopilotTestCase):
1731+ """A common test case class that provides several useful methods for the tests."""
1732+
1733+ if model() == 'Desktop':
1734+ scenarios = [
1735+ ('with mouse', dict(input_device_class=Mouse))
1736+ ]
1737+ else:
1738+ scenarios = [
1739+ ('with touch', dict(input_device_class=Touch))
1740+ ]
1741+
1742+ @property
1743+ def main_window(self):
1744+ return MainWindow(self.app)
1745+
1746+
1747+ def setUp(self):
1748+ self.pointing_device = Pointer(self.input_device_class.create())
1749+ super(UbuntuTouchAppTestCase, self).setUp()
1750+ self.launch_test_qml()
1751+
1752+
1753+ def launch_test_qml(self):
1754+ # If the test class has defined a 'test_qml' class attribute then we
1755+ # write it to disk and launch it inside the QML Scene. If not, then we
1756+ # silently do nothing (presumably the test has something else planned).
1757+ arch = subprocess.check_output(["dpkg-architecture",
1758+ "-qDEB_HOST_MULTIARCH"]).strip()
1759+ if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
1760+ qml_path = mktemp(suffix='.qml')
1761+ open(qml_path, 'w').write(self.test_qml)
1762+ self.addCleanup(remove, qml_path)
1763+
1764+ self.app = self.launch_test_application(
1765+ "/usr/lib/" + arch + "/qt5/bin/qmlscene",
1766+ "-I", get_module_include_path(),
1767+ qml_path)
1768+
1769+ if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
1770+ qml_path = self.test_qml_file
1771+ self.app = self.launch_test_application(
1772+ "/usr/lib/" + arch + "/qt5/bin/qmlscene",
1773+ "-I", get_module_include_path(),
1774+ qml_path)
1775+
1776+ self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
1777+
1778+
1779+ def get_qml_view(self):
1780+ """Get the main QML view"""
1781+
1782+ return self.app.select_single("QQuickView")
1783+
1784+ def get_mainview(self):
1785+ """Get the QML MainView"""
1786+
1787+ mainView = self.app.select_single("MainView")
1788+ self.assertThat(mainView, Not(Is(None)))
1789+ return mainView
1790+
1791+
1792+ def get_object(self,objectName):
1793+ """Get a object based on the objectName"""
1794+
1795+ obj = self.app.select_single(objectName=objectName)
1796+ self.assertThat(obj, Not(Is(None)))
1797+ return obj
1798+
1799+
1800+ def mouse_click(self,objectName):
1801+ """Move mouse on top of the object and click on it"""
1802+
1803+ obj = self.get_object(objectName)
1804+ self.pointing_device.move_to_object(obj)
1805+ self.pointing_device.click()
1806+
1807+
1808+ def mouse_press(self,objectName):
1809+ """Move mouse on top of the object and press mouse button (without releasing it)"""
1810+
1811+ obj = self.get_object(objectName)
1812+ self.pointing_device.move_to_object(obj)
1813+ self.pointing_device.press()
1814+
1815+
1816+ def mouse_release(self):
1817+ """Release mouse button"""
1818+
1819+ self.pointing_device.release()
1820+
1821+
1822+ def type_string(self, string):
1823+ """Type a string with keyboard"""
1824+
1825+ self.keyboard.type(string)
1826+
1827+
1828+ def type_key(self, key):
1829+ """Type a single key with keyboard"""
1830+
1831+ self.keyboard.key(key)
1832
1833=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main'
1834=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/__init__.py'
1835--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/__init__.py 1970-01-01 00:00:00 +0000
1836+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/__init__.py 2013-06-10 18:40:33 +0000
1837@@ -0,0 +1,1 @@
1838+""" A main.qml test suite """
1839
1840=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/test_main.py'
1841--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/test_main.py 1970-01-01 00:00:00 +0000
1842+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/test_main.py 2013-06-10 18:40:33 +0000
1843@@ -0,0 +1,23 @@
1844+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1845+
1846+"""Tests for the Hello World"""
1847+
1848+from autopilot.matchers import Eventually
1849+from textwrap import dedent
1850+from testtools.matchers import Is, Not, Equals
1851+from testtools import skip
1852+import os
1853+from uitests import UbuntuTouchAppTestCase
1854+
1855+
1856+class MainTests(UbuntuTouchAppTestCase):
1857+ """Generic tests for the Hello World"""
1858+
1859+ test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../%DISPLAYNAME%")
1860+
1861+ def test_0_can_select_mainView(self):
1862+ """Must be able to select the mainview."""
1863+
1864+ mainView = self.get_mainview()
1865+ self.assertThat(mainView.visible,Eventually(Equals(True)))
1866+
1867
1868=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit'
1869=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit/tst_hellocomponent.qml'
1870--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit/tst_hellocomponent.qml 1970-01-01 00:00:00 +0000
1871+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit/tst_hellocomponent.qml 2013-06-10 18:40:33 +0000
1872@@ -0,0 +1,49 @@
1873+import QtQuick 2.0
1874+import QtTest 1.0
1875+import Ubuntu.Components 0.1
1876+import "../../components"
1877+
1878+// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
1879+
1880+// Execute tests with:
1881+// qmltestrunner
1882+
1883+Item {
1884+ // The objects
1885+ HelloComponent {
1886+ id: objectUnderTest
1887+ }
1888+
1889+ TestCase {
1890+ name: "HelloComponent"
1891+
1892+ function init() {
1893+ console.debug(">> init");
1894+ compare("",objectUnderTest.text,"text was not empty on init");
1895+ console.debug("<< init");
1896+ }
1897+
1898+ function cleanup() {
1899+ console.debug(">> cleanup");
1900+ console.debug("<< cleanup");
1901+ }
1902+
1903+ function initTestCase() {
1904+ console.debug(">> initTestCase");
1905+ console.debug("<< initTestCase");
1906+ }
1907+
1908+ function cleanupTestCase() {
1909+ console.debug(">> cleanupTestCase");
1910+ console.debug("<< cleanupTestCase");
1911+ }
1912+
1913+ function test_canReadAndWriteText() {
1914+ var expected = "Hello World";
1915+
1916+ objectUnderTest.text = expected;
1917+
1918+ compare(expected,objectUnderTest.text,"expected did not equal result");
1919+ }
1920+ }
1921+}
1922
1923=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui'
1924=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/HelloTab.qml'
1925--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/HelloTab.qml 1970-01-01 00:00:00 +0000
1926+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/HelloTab.qml 2013-06-10 18:40:33 +0000
1927@@ -0,0 +1,30 @@
1928+import QtQuick 2.0
1929+import Ubuntu.Components 0.1
1930+import "../components"
1931+
1932+Tab {
1933+ title: i18n.tr("Hello..")
1934+
1935+ page: Page {
1936+ Column {
1937+ spacing: units.gu(2)
1938+ anchors.centerIn: parent
1939+
1940+ HelloComponent {
1941+ objectName: "helloTab_HelloComponent"
1942+
1943+ anchors.horizontalCenter: parent.horizontalCenter
1944+
1945+ text: i18n.tr("HelloTab")
1946+ }
1947+
1948+ Label {
1949+ objectName: "helloTab_label"
1950+
1951+ anchors.horizontalCenter: parent.horizontalCenter
1952+
1953+ text: i18n.tr("You can change the Tab from Page title above.")
1954+ }
1955+ }
1956+ }
1957+}
1958
1959=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTab.qml'
1960--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTab.qml 1970-01-01 00:00:00 +0000
1961+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTab.qml 2013-06-10 18:40:33 +0000
1962@@ -0,0 +1,35 @@
1963+import QtQuick 2.0
1964+import Ubuntu.Components 0.1
1965+import "../components"
1966+
1967+Tab {
1968+ title: i18n.tr("..World!")
1969+
1970+ page: Page {
1971+ tools: WorldTabTools {
1972+ objectName: "worldTab_tools"
1973+ }
1974+
1975+ Column {
1976+ spacing: units.gu(2)
1977+ anchors.centerIn: parent
1978+
1979+ HelloComponent {
1980+ objectName: "worldTab_HelloComponent"
1981+
1982+ anchors.horizontalCenter: parent.horizontalCenter
1983+
1984+ text: i18n.tr("WorldTab")
1985+ }
1986+
1987+ Label {
1988+ id: label
1989+ objectName: "worldTab_label"
1990+
1991+ anchors.horizontalCenter: parent.horizontalCenter
1992+
1993+ text: i18n.tr("Swipe from bottom to up to reveal the toolbar.")
1994+ }
1995+ }
1996+ }
1997+}
1998
1999=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTabTools.qml'
2000--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTabTools.qml 1970-01-01 00:00:00 +0000
2001+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTabTools.qml 2013-06-10 18:40:33 +0000
2002@@ -0,0 +1,13 @@
2003+import QtQuick 2.0
2004+import Ubuntu.Components 0.1
2005+
2006+ToolbarActions {
2007+ Action {
2008+ iconSource: Qt.resolvedUrl("../graphics/toolbarIcon.png")
2009+ text: i18n.tr("Tap me!")
2010+
2011+ onTriggered: {
2012+ label.text = i18n.tr("Toolbar tapped")
2013+ }
2014+ }
2015+}
2016
2017=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json'
2018--- qtcreator/share/qtcreator/ubuntu/menu.json 2013-05-04 21:41:03 +0000
2019+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json 2013-06-10 18:40:33 +0000
2020@@ -139,6 +139,13 @@
2021 "id": "Ubuntu.Menu",
2022 "parent": "Tools",
2023 "submenu": [
2024+ {
2025+ "name": "Ubuntu Touch Showcase Gallery",
2026+ "id": "Ubuntu.Menu.Showcase",
2027+ "actions": [
2028+ "%SCRIPTDIRECTORY%/qtc_launch_gallery"
2029+ ]
2030+ },
2031 {
2032 "name": "Translations",
2033 "id": "Ubuntu.Menu.i18n",
2034
2035=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_search'
2036--- qtcreator/share/qtcreator/ubuntu/scripts/device_search 2013-05-02 00:47:53 +0000
2037+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_search 2013-06-10 18:40:33 +0000
2038@@ -15,5 +15,6 @@
2039 #
2040 # Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com>
2041 set -e;
2042-
2043+adb kill-server &> /dev/null
2044+adb start-server &> /dev/null
2045 adb devices -l
2046
2047=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery'
2048--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery 1970-01-01 00:00:00 +0000
2049+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery 2013-06-10 18:40:33 +0000
2050@@ -0,0 +1,2 @@
2051+#!/bin/bash
2052+/usr/bin/qmlscene $@ /usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml &
2053
2054=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_project_packaging'
2055--- qtcreator/share/qtcreator/ubuntu/scripts/qtc_project_packaging 2013-04-25 08:45:39 +0000
2056+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_project_packaging 2013-06-10 18:40:33 +0000
2057@@ -1,3 +1,4 @@
2058+
2059 #!/bin/bash
2060 # Copyright 2013 Canonical Ltd.
2061 #
2062
2063=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings'
2064--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings 1970-01-01 00:00:00 +0000
2065+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings 2013-06-10 18:40:33 +0000
2066@@ -0,0 +1,24 @@
2067+#!/bin/bash
2068+
2069+DEBEMAIL=`grep -G "^DEBEMAIL" ~/.bashrc`
2070+DEBFULLNAME=`grep -G "^DEBFULLNAME" ~/.bashrc`
2071+
2072+if [[ ! -z "$DEBEMAIL" ]]; then
2073+ export $DEBEMAIL
2074+else
2075+ CMD=`grep -G "export DEBEMAIL=" ~/.bashrc|sed "s/\"//g"`
2076+ if [[ ! -z $CMD ]]; then
2077+ $CMD
2078+ fi
2079+fi
2080+if [[ ! -z $DEBFULLNAME ]]; then
2081+ export $DEBFULLNAME
2082+else
2083+ CMD=`grep -G "export DEBFULLNAME=" ~/.bashrc|sed "s/\"//g"|sed "s/export DEBFULLNAME=//g"`
2084+ if [[ ! -z $CMD ]]; then
2085+ export DEBFULLNAME="$CMD"
2086+ fi
2087+fi
2088+
2089+echo $DEBFULLNAME
2090+echo $DEBEMAIL
2091
2092=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/Link.qml'
2093--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/Link.qml 1970-01-01 00:00:00 +0000
2094+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/Link.qml 2013-06-10 18:40:33 +0000
2095@@ -0,0 +1,79 @@
2096+/*
2097+ * Copyright 2013 Canonical Ltd.
2098+ *
2099+ * This program is free software; you can redistribute it and/or modify
2100+ * it under the terms of the GNU Lesser General Public License as published by
2101+ * the Free Software Foundation; version 2.1.
2102+ *
2103+ * This program is distributed in the hope that it will be useful,
2104+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2105+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2106+ * GNU Lesser General Public License for more details.
2107+ *
2108+ * You should have received a copy of the GNU Lesser General Public License
2109+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2110+ *
2111+ * Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com>
2112+ */
2113+
2114+import QtQuick 1.0
2115+
2116+Rectangle {
2117+ width: linkTitle.paintedWidth
2118+ height: 60
2119+ color: "transparent"
2120+ opacity: 0.8
2121+
2122+ property alias title : linkTitle.text
2123+ property url link
2124+ property color defaultColor : "#DD4814"
2125+ property color hoverColor : "#eee"
2126+
2127+ Rectangle {
2128+ id: background
2129+ color: hoverColor
2130+ opacity: 0
2131+ anchors.fill: parent
2132+
2133+ Behavior on opacity {
2134+ NumberAnimation { duration: 250 }
2135+ }
2136+ }
2137+
2138+ Text {
2139+ id: linkTitle
2140+ anchors.centerIn: parent
2141+ wrapMode: Text.WordWrap
2142+ width: parent.width - 20
2143+ font.family: "Ubuntu"
2144+ font.pixelSize: 20
2145+ font.letterSpacing: 1.5
2146+ color: defaultColor
2147+ font.weight: Font.Light
2148+ textFormat: Text.RichText
2149+ text: ""
2150+ }
2151+
2152+ MouseArea {
2153+ anchors.fill: parent
2154+ hoverEnabled: true
2155+
2156+ onEntered: {
2157+ background.opacity = 1;
2158+ }
2159+ onExited: {
2160+ background.opacity = 0;
2161+ }
2162+
2163+ onClicked: {
2164+ Qt.openUrlExternally(link);
2165+ }
2166+ onPressed: {
2167+ linkTitle.color = Qt.lighter(defaultColor);
2168+ }
2169+ onReleased: {
2170+ linkTitle.color = defaultColor;
2171+ }
2172+ }
2173+
2174+}
2175
2176=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/NewsBox.qml'
2177--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/NewsBox.qml 1970-01-01 00:00:00 +0000
2178+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/NewsBox.qml 2013-06-10 18:40:33 +0000
2179@@ -0,0 +1,79 @@
2180+/*
2181+ * Copyright 2013 Canonical Ltd.
2182+ *
2183+ * This program is free software; you can redistribute it and/or modify
2184+ * it under the terms of the GNU Lesser General Public License as published by
2185+ * the Free Software Foundation; version 2.1.
2186+ *
2187+ * This program is distributed in the hope that it will be useful,
2188+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
2189+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2190+ * GNU Lesser General Public License for more details.
2191+ *
2192+ * You should have received a copy of the GNU Lesser General Public License
2193+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
2194+ *
2195+ * Author: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com>
2196+ */
2197+import QtQuick 2.0
2198+import QtQuick.XmlListModel 2.0
2199+
2200+ListView {
2201+
2202+ clip: true
2203+
2204+ property url link
2205+
2206+ model: XmlListModel {
2207+ source: link
2208+ query: "/rss/channel/item"
2209+
2210+ XmlRole { name: "title"; query: "title/string()" }
2211+ XmlRole { name: "link"; query: "link/string()" }
2212+ XmlRole { name: "description"; query: "description/string()" }
2213+ XmlRole { name: "pubDate"; query: "pubDate/string()" }
2214+ }
2215+ delegate: Item {
2216+ id: delegate
2217+ height: itemContent.height+ 20
2218+ width: delegate.ListView.view.width
2219+ Column {
2220+ id: itemContent
2221+ width: parent.width
2222+ Text {
2223+ text: pubDate
2224+ font.pixelSize: 10
2225+ font.family: "Ubuntu"
2226+ font.weight: Font.Light
2227+ }
2228+
2229+ Text {
2230+ text: title
2231+ font.family: "Ubuntu"
2232+ font.pixelSize: 20
2233+ font.letterSpacing: 1.5
2234+ wrapMode: Text.WordWrap
2235+ font.weight: Font.Light
2236+ width: parent.width
2237+ }
2238+
2239+ Text {
2240+ text: description
2241+ font.family: "Ubuntu"
2242+ font.pixelSize: 12
2243+ wrapMode: Text.WordWrap
2244+ font.weight: Font.Light
2245+ font.letterSpacing: 1.5
2246+ width: parent.width
2247+ textFormat: Text.RichText
2248+ }
2249+ }
2250+ MouseArea {
2251+ anchors.fill: parent
2252+ onClicked: {
2253+ Qt.openUrlExternally(linkText)
2254+ }
2255+ }
2256+ }
2257+
2258+}
2259
2260=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/welcome.qml'
2261--- qtcreator/share/qtcreator/ubuntu/welcome/welcome.qml 2013-04-08 13:34:07 +0000
2262+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/welcome.qml 2013-06-10 18:40:33 +0000
2263@@ -18,9 +18,13 @@
2264
2265 import QtQuick 1.1
2266
2267+
2268 Rectangle {
2269 color: "#F7F6F5"
2270
2271+ width: maximumWidth
2272+ height: maximumHeight
2273+
2274 property int maximumWidth : 900
2275 property int maximumHeight: 579
2276
2277@@ -31,16 +35,20 @@
2278 }
2279
2280 Rectangle {
2281- anchors.centerIn: parent
2282+ anchors.horizontalCenter: parent.horizontalCenter
2283+ // Commented out until we get Qt 5.1
2284+ /*anchors.top: parent.top
2285+ anchors.bottom: parent.bottom*/
2286+ anchors.verticalCenter: parent.verticalCenter
2287+ height: maximumHeight
2288 width: parent.width>maximumWidth ? maximumWidth : parent.width
2289- height: (parent.height>maximumHeight ? maximumHeight : parent.height) / 1.2
2290- color: "#FFF"
2291+ color: "#fff"
2292
2293 Image {
2294- anchors.verticalCenter: parent.verticalCenter
2295+ anchors.top: parent.top
2296+ anchors.topMargin: 10
2297 anchors.right: parent.right
2298 source: "images/devices.png"
2299- height: parent.height
2300 width: parent.width/2
2301 fillMode: Image.PreserveAspectFit
2302 }
2303@@ -49,11 +57,13 @@
2304 color: "transparent"
2305 anchors.margins: 20
2306 anchors.top: parent.top
2307+ anchors.topMargin: 40
2308 anchors.bottom: parent.bottom
2309 anchors.horizontalCenter: parent.horizontalCenter
2310 width: parent.width - anchors.margins*2
2311
2312 Column {
2313+ id: headerColumn
2314 spacing: 20
2315 anchors.top: parent.top
2316 anchors.left: parent.left
2317@@ -81,42 +91,29 @@
2318 }
2319
2320 Column {
2321- anchors.verticalCenter: parent.verticalCenter
2322- spacing: 5
2323- Text {
2324- wrapMode: Text.WordWrap
2325+ id: topLinks
2326+ anchors.topMargin: 50
2327+ anchors.top: headerColumn.bottom
2328+ width: parent.width
2329+ spacing: 5
2330+
2331+ Link {
2332 width: parent.width
2333- font.family: "Ubuntu"
2334- font.pixelSize: 20
2335- font.letterSpacing: 1.5
2336- font.weight: Font.Light
2337- textFormat: Text.RichText
2338- text: "<a style=\"text-decoration: none; color: #DD4814\" href=\"http://design.ubuntu.com/apps\">Design something beautiful &gt;</a>"
2339- onLinkActivated: {
2340- Qt.openUrlExternally(link);
2341- }
2342+ title: "Design something beautiful &gt;"
2343+ link: "http://design.ubuntu.com/apps"
2344 }
2345
2346- Text {
2347- id: demo
2348- wrapMode: Text.WordWrap
2349+ Link {
2350 width: parent.width
2351- font.family: "Ubuntu"
2352- font.pixelSize: 20
2353- font.letterSpacing: 1.5
2354- font.weight: Font.Light
2355- textFormat: Text.RichText
2356- text: "<a style=\"text-decoration: none; color: #DD4814\" href=\"http://developer.ubuntu.com/api/ubuntu-12.10/qml/mobile/overview-ubuntu-sdk.html\">Build something solid &gt;</a>"
2357- onLinkActivated: {
2358- Qt.openUrlExternally(link);
2359- }
2360-
2361+ title: "Build something solid &gt;"
2362+ link: "http://developer.ubuntu.com/api/ubuntu-12.10/qml/mobile/overview-ubuntu-sdk.html"
2363 }
2364 }
2365-
2366 Column {
2367- anchors.bottom: parent.bottom
2368+ id: bottomBox
2369+ anchors.top: topLinks.bottom
2370 anchors.left: parent.left
2371+ anchors.topMargin: 20
2372
2373 width: parent.width
2374 spacing: 5
2375@@ -134,15 +131,45 @@
2376 width: parent.width
2377 font.family: "Ubuntu"
2378 font.pixelSize: 18
2379+ textFormat: Text.RichText
2380 font.weight: Font.Light
2381- text: "By joining our <a style=\"text-decoration: none; color: #DD4814\" href=\"http://wiki.ubuntu.com/Touch/Contribute#Discuss\">mailing list</a> and for real-time communication join <a style=\"text-decoration: none; color: #DD4814\" href=\"http://webchat.freenode.net/?channels=ubuntu-touch\">#ubuntu-touch</a> on freenode."
2382+ text: "<style> a { text-decoration: none; color: #DD4814; cursor: pointer } </style>By joining our <a href=\"http://wiki.ubuntu.com/Touch/Contribute#Discuss\">mailing list</a> and for real-time communication join <a href=\"http://webchat.freenode.net/?channels=ubuntu-touch\">#ubuntu-touch</a> on freenode."
2383 onLinkActivated: {
2384 Qt.openUrlExternally(link);
2385 }
2386 }
2387-
2388 }
2389
2390+ /*
2391+ Commented out until we get Qt 5.1
2392+
2393+ Row {
2394+ anchors.top: bottomBox.bottom
2395+ anchors.horizontalCenter: parent.horizontalCenter
2396+ anchors.bottom: parent.bottom
2397+ anchors.right: parent.right
2398+ anchors.margins: 10
2399+ anchors.topMargin: 20
2400+ spacing: 20
2401+
2402+ NewsBox {
2403+ height: parent.height
2404+ width: parent.width/2
2405+
2406+ link: "http://developer.ubuntu.com/feed/"
2407+ }
2408+
2409+ NewsBox {
2410+ height: parent.height
2411+ width: parent.width/2
2412+
2413+ link: "http://developer.ubuntu.com/category/event/feed/"
2414+ }
2415+ }*/
2416+
2417+
2418+
2419+
2420 }
2421 }
2422 }
2423
2424=== added file 'ubuntu-qtcreator-plugins/src/plugins/plugins.pro'
2425--- ubuntu-qtcreator-plugins/src/plugins/plugins.pro 1970-01-01 00:00:00 +0000
2426+++ ubuntu-qtcreator-plugins/src/plugins/plugins.pro 2013-06-10 18:40:33 +0000
2427@@ -0,0 +1,361 @@
2428+# USE .subdir AND .depends !
2429+# OTHERWISE PLUGINS WILL BUILD IN WRONG ORDER (DIRECTORIES ARE COMPILED IN PARALLEL)
2430+
2431+TEMPLATE = subdirs
2432+
2433+SUBDIRS = plugin_coreplugin \
2434+ plugin_welcome \
2435+ plugin_find \
2436+ plugin_texteditor \
2437+ plugin_cppeditor \
2438+ plugin_bineditor \
2439+ plugin_diffeditor \
2440+ plugin_imageviewer \
2441+ plugin_bookmarks \
2442+ plugin_projectexplorer \
2443+ plugin_vcsbase \
2444+ plugin_perforce \
2445+ plugin_subversion \
2446+ plugin_git \
2447+ plugin_cvs \
2448+ plugin_cpptools \
2449+ plugin_qtsupport \
2450+ plugin_qt4projectmanager \
2451+ plugin_locator \
2452+ plugin_debugger \
2453+ plugin_help \
2454+ plugin_cpaster \
2455+ plugin_cmakeprojectmanager \
2456+ plugin_autotoolsprojectmanager \
2457+ plugin_fakevim \
2458+ plugin_designer \
2459+ plugin_resourceeditor \
2460+ plugin_genericprojectmanager \
2461+ plugin_qmljseditor \
2462+ plugin_glsleditor \
2463+ plugin_mercurial \
2464+ plugin_bazaar \
2465+ plugin_classview \
2466+ plugin_tasklist \
2467+ plugin_analyzerbase \
2468+ plugin_qmljstools \
2469+ plugin_macros \
2470+ debugger/dumper.pro \
2471+ plugin_remotelinux \
2472+ plugin_android \
2473+ plugin_madde \
2474+ plugin_valgrind \
2475+ plugin_todo \
2476+ plugin_qnx \
2477+ plugin_ubuntu
2478+
2479+exists(../shared/qbs/qbs.pro):SUBDIRS += plugin_qbsprojectmanager
2480+
2481+isEmpty(IDE_PACKAGE_MODE) {
2482+ SUBDIRS += plugin_helloworld \
2483+ plugin_updateinfo
2484+} else:!isEmpty(UPDATEINFO_ENABLE) {
2485+ SUBDIRS += plugin_updateinfo
2486+}
2487+linux-* {
2488+ SUBDIRS += debugger/ptracepreload.pro
2489+}
2490+!macx:SUBDIRS += plugin_clearcase
2491+
2492+include(../../qtcreator.pri)
2493+
2494+contains(QT_CONFIG, declarative)|!isEmpty(QT.declarative.name) {
2495+ SUBDIRS += \
2496+ plugin_qmlprojectmanager \
2497+ plugin_qmlprofiler
2498+
2499+ greaterThan(QT_MAJOR_VERSION, 4) {
2500+ SUBDIRS += plugin_qmldesigner
2501+ } else {
2502+ include(../private_headers.pri)
2503+ exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
2504+ SUBDIRS += plugin_qmldesigner
2505+ } else {
2506+ warning("QmlDesigner plugin has been disabled.")
2507+ warning("The plugin depends on private headers from QtDeclarative module.")
2508+ warning("To enable it, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
2509+ }
2510+ }
2511+} else {
2512+ warning("QmlProjectManager, QmlProfiler and QmlDesigner plugins have been disabled: The plugins require QtDeclarative");
2513+}
2514+
2515+include (debugger/lldb/guest/qtcreator-lldb.pri)
2516+
2517+plugin_coreplugin.subdir = coreplugin
2518+
2519+plugin_updateinfo.subdir = updateinfo
2520+plugin_updateinfo.depends = plugin_coreplugin
2521+
2522+plugin_welcome.subdir = welcome
2523+plugin_welcome.depends = plugin_coreplugin
2524+plugin_welcome.depends += plugin_projectexplorer
2525+
2526+plugin_find.subdir = find
2527+plugin_find.depends += plugin_coreplugin
2528+
2529+plugin_texteditor.subdir = texteditor
2530+plugin_texteditor.depends = plugin_find
2531+plugin_texteditor.depends += plugin_locator
2532+plugin_texteditor.depends += plugin_coreplugin
2533+
2534+plugin_cppeditor.subdir = cppeditor
2535+plugin_cppeditor.depends = plugin_texteditor
2536+plugin_cppeditor.depends += plugin_coreplugin
2537+plugin_cppeditor.depends += plugin_cpptools
2538+
2539+plugin_bineditor.subdir = bineditor
2540+plugin_bineditor.depends = plugin_texteditor
2541+plugin_bineditor.depends += plugin_coreplugin
2542+
2543+plugin_diffeditor.subdir = diffeditor
2544+plugin_diffeditor.depends = plugin_texteditor
2545+plugin_diffeditor.depends += plugin_coreplugin
2546+
2547+plugin_imageviewer.subdir = imageviewer
2548+plugin_imageviewer.depends = plugin_coreplugin
2549+
2550+plugin_designer.subdir = designer
2551+plugin_designer.depends = plugin_coreplugin plugin_cpptools plugin_projectexplorer plugin_texteditor
2552+
2553+plugin_vcsbase.subdir = vcsbase
2554+plugin_vcsbase.depends = plugin_find
2555+plugin_vcsbase.depends += plugin_texteditor
2556+plugin_vcsbase.depends += plugin_coreplugin
2557+plugin_vcsbase.depends += plugin_projectexplorer
2558+plugin_vcsbase.depends += plugin_cpptools
2559+
2560+plugin_perforce.subdir = perforce
2561+plugin_perforce.depends = plugin_vcsbase
2562+plugin_perforce.depends += plugin_projectexplorer
2563+plugin_perforce.depends += plugin_coreplugin
2564+
2565+plugin_git.subdir = git
2566+plugin_git.depends = plugin_vcsbase
2567+plugin_git.depends += plugin_projectexplorer
2568+plugin_git.depends += plugin_coreplugin
2569+
2570+plugin_cvs.subdir = cvs
2571+plugin_cvs.depends = plugin_vcsbase
2572+plugin_cvs.depends += plugin_projectexplorer
2573+plugin_cvs.depends += plugin_coreplugin
2574+
2575+plugin_subversion.subdir = subversion
2576+plugin_subversion.depends = plugin_vcsbase
2577+plugin_subversion.depends += plugin_projectexplorer
2578+plugin_subversion.depends += plugin_coreplugin
2579+
2580+plugin_projectexplorer.subdir = projectexplorer
2581+plugin_projectexplorer.depends = plugin_locator
2582+plugin_projectexplorer.depends += plugin_find
2583+plugin_projectexplorer.depends += plugin_coreplugin
2584+plugin_projectexplorer.depends += plugin_texteditor
2585+
2586+plugin_qtsupport.subdir = qtsupport
2587+plugin_qtsupport.depends = plugin_projectexplorer
2588+
2589+plugin_qt4projectmanager.subdir = qt4projectmanager
2590+plugin_qt4projectmanager.depends = plugin_texteditor
2591+plugin_qt4projectmanager.depends += plugin_projectexplorer
2592+plugin_qt4projectmanager.depends += plugin_qtsupport
2593+plugin_qt4projectmanager.depends += plugin_cpptools
2594+plugin_qt4projectmanager.depends += plugin_debugger
2595+plugin_qt4projectmanager.depends += plugin_qmljseditor
2596+plugin_qt4projectmanager.depends += plugin_qmljstools
2597+
2598+plugin_remotelinux.subdir = remotelinux
2599+plugin_remotelinux.depends += plugin_coreplugin
2600+plugin_remotelinux.depends += plugin_debugger
2601+plugin_remotelinux.depends += plugin_projectexplorer
2602+plugin_remotelinux.depends += plugin_qtsupport
2603+
2604+plugin_android.subdir = android
2605+plugin_android.depends = plugin_coreplugin
2606+plugin_android.depends += plugin_debugger
2607+plugin_android.depends += plugin_projectexplorer
2608+plugin_android.depends += plugin_qt4projectmanager
2609+
2610+plugin_madde.subdir = madde
2611+plugin_madde.depends += plugin_remotelinux
2612+plugin_madde.depends += plugin_qt4projectmanager
2613+
2614+plugin_locator.subdir = locator
2615+plugin_locator.depends = plugin_coreplugin
2616+
2617+plugin_cpptools.subdir = cpptools
2618+plugin_cpptools.depends = plugin_projectexplorer
2619+plugin_cpptools.depends += plugin_coreplugin
2620+plugin_cpptools.depends += plugin_texteditor
2621+plugin_cpptools.depends += plugin_find
2622+
2623+plugin_bookmarks.subdir = bookmarks
2624+plugin_bookmarks.depends = plugin_projectexplorer
2625+plugin_bookmarks.depends += plugin_coreplugin
2626+plugin_bookmarks.depends += plugin_texteditor
2627+
2628+plugin_debugger.subdir = debugger
2629+plugin_debugger.depends = plugin_projectexplorer
2630+plugin_debugger.depends += plugin_coreplugin
2631+plugin_debugger.depends += plugin_cpptools
2632+
2633+plugin_fakevim.subdir = fakevim
2634+plugin_fakevim.depends = plugin_coreplugin
2635+plugin_fakevim.depends += plugin_texteditor
2636+
2637+plugin_qtestlib.subdir = qtestlib
2638+plugin_qtestlib.depends = plugin_projectexplorer
2639+plugin_qtestlib.depends += plugin_coreplugin
2640+
2641+plugin_helloworld.subdir = helloworld
2642+plugin_helloworld.depends = plugin_coreplugin
2643+
2644+plugin_help.subdir = help
2645+plugin_help.depends = plugin_find
2646+plugin_help.depends += plugin_locator
2647+plugin_help.depends += plugin_coreplugin
2648+
2649+plugin_resourceeditor.subdir = resourceeditor
2650+plugin_resourceeditor.depends = plugin_coreplugin
2651+plugin_resourceeditor.depends = plugin_find
2652+
2653+plugin_regexp.subdir = regexp
2654+plugin_regexp.depends = plugin_coreplugin
2655+
2656+plugin_cpaster.subdir = cpaster
2657+plugin_cpaster.depends = plugin_texteditor
2658+plugin_cpaster.depends += plugin_coreplugin
2659+
2660+plugin_cmakeprojectmanager.subdir = cmakeprojectmanager
2661+plugin_cmakeprojectmanager.depends = plugin_texteditor
2662+plugin_cmakeprojectmanager.depends += plugin_projectexplorer
2663+plugin_cmakeprojectmanager.depends += plugin_cpptools
2664+plugin_cmakeprojectmanager.depends += plugin_qtsupport
2665+
2666+plugin_autotoolsprojectmanager.subdir = autotoolsprojectmanager
2667+plugin_autotoolsprojectmanager.depends = plugin_projectexplorer
2668+plugin_autotoolsprojectmanager.depends += plugin_coreplugin
2669+plugin_autotoolsprojectmanager.depends += plugin_cpptools
2670+plugin_autotoolsprojectmanager.depends += plugin_qtsupport
2671+
2672+plugin_genericprojectmanager.subdir = genericprojectmanager
2673+plugin_genericprojectmanager.depends = plugin_texteditor
2674+plugin_genericprojectmanager.depends += plugin_projectexplorer
2675+plugin_genericprojectmanager.depends += plugin_cpptools
2676+plugin_genericprojectmanager.depends += plugin_qtsupport
2677+
2678+plugin_qmljseditor.subdir = qmljseditor
2679+plugin_qmljseditor.depends = plugin_texteditor
2680+plugin_qmljseditor.depends += plugin_coreplugin
2681+plugin_qmljseditor.depends += plugin_projectexplorer
2682+plugin_qmljseditor.depends += plugin_qmljstools
2683+
2684+plugin_glsleditor.subdir = glsleditor
2685+plugin_glsleditor.depends = plugin_texteditor
2686+plugin_glsleditor.depends += plugin_coreplugin
2687+plugin_glsleditor.depends += plugin_projectexplorer
2688+plugin_glsleditor.depends += plugin_cpptools
2689+
2690+plugin_qmlprojectmanager.subdir = qmlprojectmanager
2691+plugin_qmlprojectmanager.depends = plugin_texteditor
2692+plugin_qmlprojectmanager.depends += plugin_projectexplorer
2693+plugin_qmlprojectmanager.depends += plugin_qmljseditor
2694+plugin_qmlprojectmanager.depends += plugin_qmljstools
2695+plugin_qmlprojectmanager.depends += plugin_debugger
2696+plugin_qmlprojectmanager.depends += plugin_qtsupport
2697+
2698+plugin_qmldesigner.subdir = qmldesigner
2699+plugin_qmldesigner.depends = plugin_coreplugin
2700+plugin_qmldesigner.depends += plugin_texteditor
2701+plugin_qmldesigner.depends += plugin_qmljseditor
2702+plugin_qmldesigner.depends += plugin_projectexplorer
2703+plugin_qmldesigner.depends += plugin_qt4projectmanager
2704+plugin_qmldesigner.depends += plugin_qmlprojectmanager
2705+plugin_qmldesigner.depends += plugin_cpptools
2706+
2707+plugin_mercurial.subdir = mercurial
2708+plugin_mercurial.depends = plugin_vcsbase
2709+plugin_mercurial.depends += plugin_projectexplorer
2710+plugin_mercurial.depends += plugin_coreplugin
2711+
2712+plugin_bazaar.subdir = bazaar
2713+plugin_bazaar.depends = plugin_vcsbase
2714+plugin_bazaar.depends += plugin_projectexplorer
2715+plugin_bazaar.depends += plugin_coreplugin
2716+
2717+plugin_classview.subdir = classview
2718+plugin_classview.depends = plugin_coreplugin
2719+plugin_classview.depends += plugin_cpptools
2720+plugin_classview.depends += plugin_projectexplorer
2721+plugin_classview.depends += plugin_texteditor
2722+
2723+plugin_tasklist.subdir = tasklist
2724+plugin_tasklist.depends = plugin_coreplugin
2725+plugin_tasklist.depends += plugin_projectexplorer
2726+
2727+plugin_analyzerbase.subdir = analyzerbase
2728+plugin_analyzerbase.depends = plugin_coreplugin
2729+plugin_analyzerbase.depends += plugin_projectexplorer
2730+plugin_analyzerbase.depends += plugin_remotelinux
2731+plugin_analyzerbase.depends += plugin_cpptools
2732+
2733+plugin_valgrind.subdir = valgrind
2734+plugin_valgrind.depends = plugin_coreplugin
2735+plugin_valgrind.depends += plugin_analyzerbase
2736+plugin_valgrind.depends += plugin_remotelinux
2737+plugin_valgrind.depends += plugin_texteditor
2738+
2739+plugin_qmlprofiler.subdir = qmlprofiler
2740+plugin_qmlprofiler.depends = plugin_coreplugin
2741+plugin_qmlprofiler.depends += plugin_analyzerbase
2742+plugin_qmlprofiler.depends += plugin_qmlprojectmanager
2743+plugin_qmlprofiler.depends += plugin_qt4projectmanager
2744+plugin_qmlprofiler.depends += plugin_remotelinux
2745+plugin_qmlprofiler.depends += plugin_qmljstools
2746+
2747+plugin_qmljstools.subdir = qmljstools
2748+plugin_qmljstools.depends = plugin_projectexplorer
2749+plugin_qmljstools.depends += plugin_coreplugin
2750+plugin_qmljstools.depends += plugin_texteditor
2751+plugin_qmljstools.depends += plugin_qtsupport
2752+plugin_qmljstools.depends += plugin_cpptools
2753+
2754+plugin_macros.subdir = macros
2755+plugin_macros.depends = plugin_texteditor
2756+plugin_macros.depends += plugin_find
2757+plugin_macros.depends += plugin_locator
2758+plugin_macros.depends += plugin_coreplugin
2759+
2760+plugin_todo.subdir = todo
2761+plugin_todo.depends = plugin_coreplugin
2762+plugin_todo.depends += plugin_projectexplorer
2763+plugin_todo.depends += plugin_texteditor
2764+plugin_todo.depends += plugin_cpptools
2765+
2766+plugin_qnx.subdir = qnx
2767+plugin_qnx.depends = plugin_remotelinux
2768+plugin_qnx.depends += plugin_qt4projectmanager
2769+plugin_qnx.depends += plugin_coreplugin
2770+plugin_qnx.depends += plugin_texteditor
2771+
2772+plugin_qbsprojectmanager.subdir = qbsprojectmanager
2773+plugin_qbsprojectmanager.depends = plugin_texteditor
2774+plugin_qbsprojectmanager.depends += plugin_projectexplorer
2775+plugin_qbsprojectmanager.depends += plugin_cpptools
2776+plugin_qbsprojectmanager.depends += plugin_qmljstools
2777+plugin_qbsprojectmanager.depends += plugin_qtsupport
2778+
2779+plugin_clearcase.subdir = clearcase
2780+plugin_clearcase.depends = plugin_vcsbase
2781+plugin_clearcase.depends += plugin_projectexplorer
2782+plugin_clearcase.depends += plugin_coreplugin
2783+
2784+plugin_ubuntu.subdir = ubuntu
2785+plugin_ubuntu.depends = plugin_coreplugin
2786+plugin_ubuntu.depends += plugin_projectexplorer
2787+plugin_ubuntu.depends += plugin_qt4projectmanager
2788+plugin_ubuntu.depends += plugin_qmlprojectmanager
2789
2790=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntu.pro'
2791--- qtcreator/src/plugins/ubuntu/ubuntu.pro 2013-02-20 12:33:10 +0000
2792+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntu.pro 2013-06-10 18:40:33 +0000
2793@@ -2,14 +2,14 @@
2794 TARGET = Ubuntu
2795 DEFINES += UBUNTU_LIBRARY
2796
2797-QT += network declarative
2798+QT += network qml quick
2799
2800 PROVIDER = Canonical
2801-
2802-include(../../qtcreatorplugin.pri)
2803-include(../coreplugin/coreplugin.pri)
2804-include(../projectexplorer/projectexplorer.pri)
2805-include(../qmlprojectmanager/qmlprojectmanager.pri)
2806+message($$PWD)
2807+include($$PWD/../../qtcreatorplugin.pri)
2808+include($$PWD/../coreplugin/coreplugin.pri)
2809+include($$PWD/../projectexplorer/projectexplorer.pri)
2810+include($$PWD/../qmlprojectmanager/qmlprojectmanager.pri)
2811
2812 LIBS += -L$$IDE_PLUGIN_PATH/QtProject
2813
2814
2815=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuconstants.h'
2816--- qtcreator/src/plugins/ubuntu/ubuntuconstants.h 2013-05-04 21:41:03 +0000
2817+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuconstants.h 2013-06-10 18:40:33 +0000
2818@@ -33,6 +33,7 @@
2819 const char UBUNTU_QMLPROJECT_TYPE[] = "qmlproject";
2820 const char UBUNTU_QTPROJECT_TYPE[] = "pro";
2821 const char UBUNTU_QML_TYPE[] = "qml";
2822+const char UBUNTU_HAS_TESTS[] = "hasTests";
2823
2824 const QString UBUNTU_WELCOMESCREEN_QML = Core::ICore::resourcePath() + QLatin1String("/ubuntu/welcome/welcome.qml");
2825 const QString UBUNTU_TEMPLATESPATH = Core::ICore::resourcePath() + QLatin1String("/templates/wizards/ubuntu/");
2826
2827=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.cpp'
2828--- qtcreator/src/plugins/ubuntu/ubuntuplugin.cpp 2013-04-08 13:34:07 +0000
2829+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.cpp 2013-06-10 18:40:33 +0000
2830@@ -26,7 +26,7 @@
2831 #include <QJsonArray>
2832 #include <QJsonObject>
2833 #include <QDebug>
2834-
2835+#include <QGuiApplication>
2836
2837 using namespace Ubuntu::Internal;
2838
2839
2840=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp'
2841--- qtcreator/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp 2013-05-03 23:00:15 +0000
2842+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp 2013-06-10 18:40:33 +0000
2843@@ -118,6 +118,13 @@
2844 if (tmp_type.isUndefined() == false) {
2845 projectType = tmp_type.toString();
2846 }
2847+
2848+ QJsonValue tmp_hasTests = m_obj.value(QLatin1String(Constants::UBUNTU_HAS_TESTS));
2849+ bool hasTests = false;
2850+ if (tmp_hasTests.isUndefined() == false) {
2851+ hasTests = tmp_hasTests.toBool();
2852+ }
2853+
2854 const UbuntuProjectApplicationWizardDialog *wizard = qobject_cast<const UbuntuProjectApplicationWizardDialog *>(w);
2855 const QString projectName = wizard->projectName();
2856 const QString projectPath = wizard->path() + QLatin1Char('/') + projectName;
2857@@ -187,6 +194,9 @@
2858 << " }" << endl
2859 << " Files {" << endl
2860 << " filter: \"*.desktop\"" << endl
2861+ << " }" << endl
2862+ << " Files {" << endl
2863+ << " filter: \"Makefile\"" << endl
2864 << " }" << endl;
2865 if (projectType == QLatin1String(Constants::UBUNTU_HTMLPROJECT_TYPE)) {
2866 out << " Files {" << endl
2867@@ -194,7 +204,7 @@
2868 << " filter: \"*\"" << endl
2869 << " }" << endl;
2870 }
2871- if (projectType == QLatin1String(Constants::UBUNTU_AUTOPILOTPROJECT_TYPE)) {
2872+ if (hasTests || projectType == QLatin1String(Constants::UBUNTU_AUTOPILOTPROJECT_TYPE)) {
2873 out << " Files {" << endl
2874 << " directory: \"tests/\"" << endl
2875 << " filter: \"*\"" << endl

Subscribers

People subscribed via source and target branches