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

[Juhapekka Piiroinen]

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

[lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/refactoring-and-fixing]

197. By Juhapekka Piiroinen on 2013-06-03

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

198. By Juhapekka Piiroinen on 2013-06-03

Fixes bug #1174900 [bazaar] set UserEmail and UserName

199. By Juhapekka Piiroinen on 2013-06-03

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

200. By Juhapekka Piiroinen on 2013-06-06

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

Added "make install" target.

201. By Juhapekka Piiroinen on 2013-06-06

fixed gallery launching

202. By Juhapekka Piiroinen on 2013-06-06

Fixed autopilot test for simple template.

203. By Juhapekka Piiroinen on 2013-06-06

removed autopilot and unit templates.

204. By Juhapekka Piiroinen on 2013-06-06

work in progress commit

205. By Juhapekka Piiroinen on 2013-06-07

Fixed python module name to lowercase

206. By Juhapekka Piiroinen on 2013-06-07

Fixed simple application template

207. By Juhapekka Piiroinen on 2013-06-07

Improved Tabbed template

208. By Juhapekka Piiroinen on 2013-06-07

Added missing autopilot tests to json file

209. By Juhapekka Piiroinen on 2013-06-07

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

210. By Juhapekka Piiroinen on 2013-06-07

Improved application templates

211. By Juhapekka Piiroinen on 2013-06-07

fixed typo

212. By Juhapekka Piiroinen on 2013-06-07

fixed filename issue

213. By Juhapekka Piiroinen on 2013-06-07

added missing file

214. By Juhapekka Piiroinen on 2013-06-10

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

215. By Juhapekka Piiroinen on 2013-06-10

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 on 2013-06-10

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

217. By Juhapekka Piiroinen on 2013-06-10

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

=== modified file 'Makefile'
--- Makefile	2013-02-14 11:08:07 +0000
+++ Makefile	2013-06-10 18:40:33 +0000
@@ -1,6 +1,72 @@
+CORES = `cat /proc/cpuinfo |grep processor|wc -l`
+VERSION = 2.7.1
+SRCPATH = qtcreator-${VERSION}
+ARCH = $(shell arch)
+BUILDPATH = build-$(ARCH)
+
 all:
-	./prepare
-	./build
+	make src
+	make build
+
+src:
+	apt-get source qtcreator=${VERSION}
+	sed -i "s/qtcreator-plugin/#qtcreator-plugin/g" $(SRCPATH)/debian/patches/series
+	sed -i "s/ubuntu/#ubuntu/g" $(SRCPATH)/debian/patches/series
+	sed -i "s/tar xvf debian/#tar xvf debian/g" $(SRCPATH)/debian/rules
+	cp $(SRCPATH)/src/plugins/plugins.pro $(SRCPATH)/src/plugins/plugins.pro.orig
+	cp $(SRCPATH)/share/qtcreator/static.pro $(SRCPATH)/share/qtcreator/static.pro.orig
+	make copy-plugin-src
+
+copy-plugin-src:
+	cp -r ubuntu-qtcreator-plugins/* $(SRCPATH)/
+
+update-plugin-share:
+	cp -r ubuntu-qtcreator-plugins/share $(BUILDPATH)/
+
+clean-src:
+	rm -Rf $(SRCPATH)
+
+clean-build:
+	rm -Rf $(BUILDPATH)
+
+clean-project:
+	make clean-src
+	make clean-build
+	rm qtcreator_${VERSION}*
+
+build:
+	mkdir -p $(BUILDPATH)
+	set -e; cd $(BUILDPATH); \
+	qmake -r ../$(SRCPATH); \
+	make -j${CORES}
+
+run:
+	$(BUILDPATH)/bin/qtcreator
 
 clean:
-	rm tmp -Rf
+	cd $(BUILDPATH); make clean
+
+distclean:
+	cd $(BUILDPATH); make distclean
+
+install:
+	cd $(BUILDPATH); INSTALL_ROOT=/usr make install
+	cp $(SRCPATH)/debian/*.desktop /usr/share/applications
+
+release:
+	cd $(SRCPATH); \
+	dch -U; \
+	dch -r
+
+package:
+	make src
+	cd $(SRCPATH); dpkg-buildpackage -us -uc -nc -j${CORES}
+
+build-dep:
+	sudo apt-get build-dep qtcreator
+
+build-dep-ppa:
+	sudo apt-add-repository ppa:ubuntu-sdk-team/ppa
+	sudo sed -i "s/# deb-src/deb-src/g" /etc/apt/sources.list.d/ubuntu-sdk-team-ppa-*.list
+	sudo apt-add-repository ppa:canonical-qt5-edgers/qt5-proper
+	sudo apt-get update
 
=== removed file 'README'
--- README	2013-05-01 21:17:32 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-
-Ubuntu Qt Creator plugins
-===================================
-
-0) This plugin requires following:
-
- qtcreator
- android-tools-adb 
-
-1) Scripts
------------------------------------
- prepare	This script will fetch the Qt Creator source code
-		and creates a source package.
-
- build		This script builds the project inside pbuilder-dist.
-		Accepts command line argument 'release'.
-
- build-package	This script will execute dpkg-buildpackage
-
-
-2) Directories
------------------------------------
- qtcreator	This directory contains the Ubuntu Qt Creator plugin.
-
- patches	This directory contains the patches which are executed with 'prepare'
-
- packaging	This directory contains the packaging related changes which are done in 'prepare'
- 
-
-3) Makefile
------------------------------------
- make		Build project in pbuilder-dist
- make clean	Deletes the temporary files which were created during 'make' / 'prepare'
-
 
=== removed file 'build'
--- build	2013-04-08 13:34:07 +0000
+++ build	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-#!/bin/bash
-# Copyright 2013 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 2.1.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Juhapekka Piiroinen <[e-mail]>
-
-echo
-echo "Compiling project in pbuilder-dist."
-echo "-----------------------------------"
-read -p "Distribution: " DIST
-read -p "Architecture: " ARCH
-echo
-DSCFILE=`ls -t tmp/*.dsc|head -n1`
-echo "Building $DSCFILE"
-pbuilder-dist $DIST $ARCH build $DSCFILE
-if [ $? == 1 ]; then
-  echo
-  echo "Have you created the target with:"
-  echo "  pbuilder-dist $DIST $ARCH create"
-  echo
-  exit
-fi
-echo "-----------------------------------"
-echo "Check results in ~/pbuilder/"
 
=== removed file 'build-package'
--- build-package	2013-04-08 13:34:07 +0000
+++ build-package	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/bash
-# Copyright 2013 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 2.1.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Juhapekka Piiroinen <[e-mail]>
-cd tmp
-cd qtcreator*
-cp -r ../../qtcreator/* .
-dpkg-source --commit --include-binaries
-dpkg-buildpackage -us -uc -nc
 
=== removed directory 'packaging'
=== removed file 'packaging/ubuntu-qtcreator-plugins.install'
--- packaging/ubuntu-qtcreator-plugins.install	2013-02-14 15:19:23 +0000
+++ packaging/ubuntu-qtcreator-plugins.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/share/qtcreator/templates/wizards/ubuntu
-usr/share/qtcreator/ubuntu
-usr/lib/*/qtcreator/plugins/Canonical
 
=== removed symlink 'packaging/ubuntu-qtcreator-plugins.install.linux'
=== target was u'ubuntu-qtcreator-plugins.install'
=== removed directory 'patches'
=== removed file 'patches/2013-04-control.patch'
--- patches/2013-04-control.patch	2013-04-18 04:44:02 +0000
+++ patches/2013-04-control.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
---- debian/control	2013-04-04 15:42:30.000000000 +0300
-+++ debian/control	2013-04-12 10:32:02.126392842 +0300
-@@ -57,7 +57,8 @@
-             qtdeclarative5-dev,
-             qmlscene,
-             qtcreator-doc,
--            xterm | x-terminal-emulator
-+            xterm | x-terminal-emulator,
-+            dh-make
- Suggests: cmake, git, kdelibs5-data, subversion, ubuntu-sdk, qtquick1-5-dev, qtquick1-5-dev-tools
- Description: lightweight integrated development environment (IDE) for Qt
-  Qt Creator is a new, lightweight, cross-platform integrated development
 
=== removed file 'prepare'
--- prepare	2013-04-12 08:36:54 +0000
+++ prepare	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Copyright 2013 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 2.1.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Juhapekka Piiroinen <[e-mail]>
-set -e
-
-rm -Rf tmp
-mkdir tmp
-cd tmp
-apt-get source qtcreator
-if [[ $? != 0 ]]; then
-  exit 2
-fi
-cd qtcreator*
-cp -dr ../../qtcreator/* .
-set +e
-patch -tp0 < ../../patches/2013-04-control.patch
-#patch -tp0 < ../../patches/override_dh_shlibdeps-skip-ubuntu-qtcreator-plugins.diff
-#patch -tp0 < ../../patches/add-new-packages.diff
-#patch -tp0 < ../../patches/add-statics.diff
-#patch -tp0 < ../../patches/fix-package-depends.diff
-set -e
-#cp -d ../../packaging/* debian/
-if [[ $1 == "release" ]]; then
-  dch -U
-  dch -r
-fi
-dpkg-source --include-binaries --commit . ubuntu
-debuild -S -sa -i -us -uc
 
=== removed directory 'qt5libs'
=== removed directory 'qt5libs/debian'
=== removed file 'qt5libs/debian/changelog'
--- qt5libs/debian/changelog	2013-02-15 16:36:55 +0000
+++ qt5libs/debian/changelog	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-ubuntu-qtcreator-qt5libs (0.1-1ubuntu1) quantal; urgency=low
-
-  * Quantal release
-
- -- Juhapekka Piiroinen <[e-mail]>  Fri, 15 Feb 2013 18:35:46 +0200
-
-ubuntu-qtcreator-qt5libs (0.1-1) unstable; urgency=low
-
-  * Initial release
-
- -- Juhapekka Piiroinen <[e-mail]>  Fri, 15 Feb 2013 16:29:09 +0200
 
=== removed file 'qt5libs/debian/compat'
--- qt5libs/debian/compat	2013-02-15 15:03:23 +0000
+++ qt5libs/debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-8
 
=== removed file 'qt5libs/debian/control'
--- qt5libs/debian/control	2013-02-15 16:36:55 +0000
+++ qt5libs/debian/control	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-Source: ubuntu-qtcreator-qt5libs
-Priority: extra
-Maintainer: Juhapekka Piiroinen <[e-mail]>
-Build-Depends: debhelper (>= 9.0.0),
-               libqt5sql5-sqlite (>= 5.0.1~),
-               libqt5designercomponents5 (>= 5.0.1~),
-               libqt5designer5 (>= 5.0.1~),
-               libqt5clucene5 (>= 5.0.1~),
-               qttools5-private-dev (>= 5.0.1~),
-               libqt5v8-5-private-dev (>= 5.0.1~),
-               libqt5help5 (>= 5.0.1~),
-               qttools5-dev (>= 5.0.1~),
-               qttools5-dev-tools (>= 5.0.1~),
-               qt5-qmake (>= 5.0.1~),
-               qtbase5-private-dev (>= 5.0.1~),
-               libqt5script5 (>= 5.0.1~),
-               libqt5scripttools5 (>= 5.0.1~),
-               qt5-default,
-               qtscript5-private-dev (>= 5.0.1~),
-               qtxmlpatterns5-dev-tools (>= 5.0.1~),
-               libqt5widgets5 (>= 5.0.1~),
-               qttools5-dev-tools (>= 5.0.1~),
-               qtdeclarative5-private-dev (>= 5.0.1~),
-               qtdeclarative5-dev-tools (>= 5.0.1~),
-               qtquick1-5-dev (>= 5.0.1~),
-               qtquick1-5-dev-tools (>= 5.0.1~),
-               libqt5help5 (>= 5.0.1~),
-               qtlocation5-dev,
-               qtsensors5-dev
-Standards-Version: 3.9.4
-Section: libs
-Homepage: http://launchpad.net/ubuntu-qtcreator-plugins
-
-Package: ubuntu-qtcreator-qt5libs
-Section: libs
-Architecture: any
-Depends: ubuntu-qtcreator-plugins
-Description: Qt 5 libraries for Qt Creator
- This package contains Qt 5 libraries for Qt Creator.
 
=== removed file 'qt5libs/debian/rules'
--- qt5libs/debian/rules	2013-02-15 16:09:13 +0000
+++ qt5libs/debian/rules	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-TARGET_PATH=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator
-BIN_PATH=$(CURDIR)/debian/tmp/usr/bin
-%:
-	dh $@
-
-override_dh_installdirs:
-	mkdir -p $(BIN_PATH)
-	echo "#!/bin/bash" > $(BIN_PATH)/ubuntu-qtcreator
-	echo "QT_PLUGIN_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/qtcreator/qt5/plugins qtcreator" >> $(BIN_PATH)/ubuntu-qtcreator
-	chmod +x $(BIN_PATH)/ubuntu-qtcreator
-
-	mkdir -p $(TARGET_PATH)
-	cp -dr /usr/lib/$(DEB_HOST_MULTIARCH)/qt5 $(TARGET_PATH)
-	cp -d /usr/lib/$(DEB_HOST_MULTIARCH)/libQt5*so* $(TARGET_PATH)
-
 
=== removed directory 'qt5libs/debian/source'
=== removed file 'qt5libs/debian/source/format'
--- qt5libs/debian/source/format	2013-02-15 15:03:23 +0000
+++ qt5libs/debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (native)
 
=== removed file 'qt5libs/debian/source/include-binaries'
--- qt5libs/debian/source/include-binaries	2013-02-15 15:03:23 +0000
+++ qt5libs/debian/source/include-binaries	1970-01-01 00:00:00 +0000
@@ -1,331 +0,0 @@
-usr
-usr/lib
-usr/lib/x86_64-linux-gnu
-usr/lib/x86_64-linux-gnu/qtcreator
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Help.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DesignerComponents.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Help.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Script.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DBus.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5PrintSupport.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Gui.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Xml.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Declarative.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Help.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5XmlPatterns.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Core.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sql.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DesignerComponents.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Location.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Widgets.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5V8.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5CLucene.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DesignerComponents.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5CLucene.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Gui.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5CLucene.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Location.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Core.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Location.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5PrintSupport.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Qml.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKitWidgets.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt53D.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Network.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Qml.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sql.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Concurrent.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKitWidgets.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Concurrent.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickParticles.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Network.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Concurrent.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Core.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5XmlPatterns.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickTest.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickTest.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Test.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5ScriptTools.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Quick.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5V8.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5PrintSupport.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Qml.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Test.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Xml.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Quick.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5CLucene.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Quick.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DBus.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickParticles.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Declarative.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sql.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Script.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Xml.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Declarative.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Location.so.5.0.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Network.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Network.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Concurrent.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sql.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Widgets.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5XmlPatterns.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5ScriptTools.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5OpenGL.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Test.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKitWidgets.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Designer.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5OpenGL.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Gui.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5OpenGL.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickTest.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DBus.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickParticles.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt53D.so.5.0.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Gui.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DBus.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.prl
-usr/lib/x86_64-linux-gnu/qtcreator/libQt53D.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Script.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5V8.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5PrintSupport.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Designer.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Quick.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Script.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5V8.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Help.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5ScriptTools.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickTest.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Designer.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Core.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Declarative.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5DesignerComponents.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.so.5.0.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKit.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKit.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Qml.so.5.0
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Xml.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Widgets.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/qt5
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/libexec
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/libexec/QtWebPluginProcess
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/libexec/QtWebProcess
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/uic
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/rcc
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/moc
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qml1plugindump
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/lrelease
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlprofiler
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/lconvert
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmake
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdbusviewer
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdbusxml2cpp
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdbuscpp2xml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qhelpconverter
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/syncqt
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdbus
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/xmlpatterns
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qhelpgenerator
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlplugindump
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmltestrunner
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/lupdate
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qcollectiongenerator
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/designer
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/pixeltool
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlbundle
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlmin
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/linguist
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/assistant
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qmlviewer
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/qdoc
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/bin/xmlpatternsvalidator
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtSensors
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtSensors/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtSensors/libdeclarative_sensors.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtSensors/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick.2
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick.2/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick.2/libqtquick2plugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick.2/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/PageStack.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/AnimatedItem.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/UbuntuShape.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/sliderUtils.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/SheetBase.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/Pointer.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/Popover.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/ubuntu-components-popups.qdoc
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/internalPopupUtils.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/Dialog.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/DefaultSheet.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/ComposerSheet.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/popupUtils.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Popups/PopupBase.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Label.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Page.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ModelSectionCounter.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/scrollbarUtils.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/mathUtils.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Tabs.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Scrollbar.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ActivityIndicator.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/componentUtils.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/TextArea.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Object.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ActionList.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Toolbar.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ProgressBar.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/TextField.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/TextCustom.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Action.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Slider.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ToolbarActions.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/PageWrapperUtils.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/CheckBox.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Button.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/MainView.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Header.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/TabButton.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/fontUtils.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/stack.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ValueSelector.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/MultiValue.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Base.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/SingleValue.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/SingleControl.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Standard.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Divider.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ubuntu-components-listitems.qdoc
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ImageWithFallback.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Subtitled.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Empty.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/artwork/[e-mail]
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Header.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ProgressionVisual.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/IconVisual.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/ThinDivider.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/Caption.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/ListItems/LabelVisual.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/DraggingArea.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Tab.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/PageWrapper.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/Switch.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/GenericToolbar.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/Ubuntu/Components/AbstractButton.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/testlogger.js
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/TestCase.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/libqmltestplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtTest/SignalSpy.qml
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtLocation
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtLocation/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtLocation/libdeclarative_location.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtLocation/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick/XmlListModel
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick/XmlListModel/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick/XmlListModel/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/geoservices
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/geoservices/libqtgeoservices_nokia.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/bearer
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/bearer/libqnmbearer.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/bearer/libqconnmanbearer.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/bearer/libqgenericbearer.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/printsupport
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/printsupport/libcupsprintersupport.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic/libqevdevtouchplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic/libqevdevmouseplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic/libqevdevkeyboardplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/generic/libqevdevtabletplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/imageformats
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/imageformats/libqico.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/imageformats/libqgif.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/imageformats/libqjpeg.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sqldrivers
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sqldrivers/libqsqlite.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling/libqmldbg_qtquick2.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling/libqmldbg_inspector.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/qmltooling/libqmldbg_tcp.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforminputcontexts
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/accessible
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/accessible/libqtaccessiblequick.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/accessible/libqtaccessiblewidgets.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforms
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforms/libqlinuxfb.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforms/libqxcb.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/platforms/libqminimal.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/position
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/position/libqtposition_geoclue.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensors
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensors/libqtsensors_generic.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensors/libqtsensors_dummy.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensors/libqtsensors_linuxsys.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensorgestures
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensorgestures/libqtsensorgestures_plugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensorgestures/libqtsensorgestures_shakeplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/plugins/sensorgestures/libqtsensorgestures_counterplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/gestures
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/gestures/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/gestures/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/gestures/libqmlgesturesplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/shaders
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/shaders/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/shaders/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/shaders/libqmlshadersplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/folderlistmodel
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/folderlistmodel/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/folderlistmodel/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/particles
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/particles/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/particles/libqmlparticlesplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/Qt/labs/particles/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/QtWebKit
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/QtWebKit/qmldir
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/QtWebKit/plugins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/QtWebKit/libqmlwebkitplugin.so
-usr/lib/x86_64-linux-gnu/qtcreator/qt5/imports/builtins.qmltypes
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Test.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Sensors.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5ScriptTools.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Designer.so
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5WebKit.so.5
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5Widgets.so.5.0.1
-usr/lib/x86_64-linux-gnu/qtcreator/libQt5QuickParticles.so.5.0
 
=== removed file 'qt5libs/debian/ubuntu-qtcreator-qt5libs.install'
--- qt5libs/debian/ubuntu-qtcreator-qt5libs.install	2013-02-15 16:04:20 +0000
+++ qt5libs/debian/ubuntu-qtcreator-qt5libs.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/qtcreator
-usr/bin
 
=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot'
=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/Makefile'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/Makefile	2013-05-03 23:00:15 +0000
+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/Makefile	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-check:
-	cd tests
-	autopilot run qmluitests
 
=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/helloworld.qml'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/helloworld.qml	2013-02-14 11:31:47 +0000
+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/helloworld.qml	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-/*!
-    \brief A Hello World application with a functional tests with autopilot-qt
-*/
-
-MainView {
-    // objectName for functional testing purposes (autopilot-qt5)
-    objectName: "mainView"
-
-    width: units.gu(100)
-    height: units.gu(75)
-
-    Column {
-        anchors.centerIn: parent
-        width: units.gu(40)
-        spacing: units.gu(2)
-
-        Label {
-            id: label
-            objectName: "label"
-
-            text: "Hello.."
-        }
-        Button {
-            objectName: "button"
-            width: parent.width
-
-            text: "Tap me!"
-
-            onClicked: {
-                label.text = "..world!"
-            }
-        }
-    }
-}
 
=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests'
=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests'
=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic'
=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/__init__.py'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/__init__.py	2013-02-14 11:31:47 +0000
+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-""" A Generic test suite """
 
=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/test_helloworld.py'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/test_helloworld.py	2013-05-03 23:00:15 +0000
+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/Generic/test_helloworld.py	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Tests for the Hello World"""
-
-from autopilot.matchers import Eventually
-from textwrap import dedent
-from testtools.matchers import Is, Not, Equals
-from testtools import skip
-import os
-from tests import HelloWorldTestCase
-
-
-class GenericTests(HelloWorldTestCase):
-    """Generic tests for the Hello World"""
-
-    test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../helloworld")
-
-    def test_can_select_mainView(self):
-        """Must be able to select the button."""
-
-        mainView = self.app.select_single('MainView')
-        self.assertThat(mainView, Not(Is(None)))
-        self.assertThat(mainView.visible,Eventually(Equals(True)))
-
-    def test_can_tap_button(self):
-        """Must be able to tap the button"""
-
-        lbl = self.app.select_single(objectName="label")
-        self.assertThat(lbl, Not(Is(None)))
-
-        btn = self.app.select_single(objectName="button")
-        self.assertThat(btn, Not(Is(None)))
-        self.assertThat(btn.visible, Eventually(Equals(True)))
-
-        self.mouse.move_to_object(btn)
-        self.mouse.click()
-
-        self.assertThat(lbl.text, Eventually(Equals("..world!")))
-
 
=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/__init__.py'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/__init__.py	2013-05-03 23:00:15 +0000
+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/autopilot/tests/qmluitests/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Hello World autopilot tests."""
-
-from os import remove
-import os.path
-from tempfile import mktemp
-
-from autopilot.matchers import Eventually
-from testtools.matchers import Is, Not, Equals
-from autopilot.introspection.qt import QtIntrospectionTestMixin
-from autopilot.testcase import AutopilotTestCase
-
-
-def get_module_include_path():
-    return os.path.abspath(
-        os.path.join(
-            os.path.dirname(__file__),
-            '..',
-            '..',
-            '..',
-            '..',
-            'modules')
-        )
-
-
-class HelloWorldTestCase(AutopilotTestCase, QtIntrospectionTestMixin):
-
-    """A common test case class that provides several useful methods for the HelloWorld tests."""
-
-    def setUp(self):
-        super(HelloWorldTestCase, self).setUp()
-        self.launch_test_qml()
-
-    def launch_test_qml(self):
-        # If the test class has defined a 'test_qml' class attribute then we
-        # write it to disk and launch it inside the Qml Viewer. If not, then we
-        # silently do nothing (presumably the test has something else planned).
-        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
-            qml_path = mktemp(suffix='.qml')
-            open(qml_path, 'w').write(self.test_qml)
-            self.addCleanup(remove, qml_path)
-
-            self.app = self.launch_test_application(
-                "qmlscene",
-                "-I", get_module_include_path(),
-                qml_path)
-
-        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
-            qml_path = self.test_qml_file
-            self.app = self.launch_test_application(
-                "qmlscene",
-                "-I", get_module_include_path(),
-                qml_path)
 
=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/tabs/[e-mail]'
 Binary files qtcreator/share/qtcreator/templates/wizards/ubuntu/tabs/[e-mail]	2013-04-24 06:10:16 +0000 and qtcreator/share/qtcreator/templates/wizards/ubuntu/tabs/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed directory 'qtcreator/share/qtcreator/templates/wizards/ubuntu/unit'
=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/Makefile'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/Makefile	2013-05-03 23:00:15 +0000
+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/Makefile	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-check:
-	qmltestrunner
 
=== removed file 'qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/tst_test.qml'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/tst_test.qml	2013-05-03 23:00:15 +0000
+++ qtcreator/share/qtcreator/templates/wizards/ubuntu/unit/tst_test.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import Ubuntu.Components 0.1
-
-// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
-
-Item {
-    // The objects
-    Button {
-        id: objectUnderTest
-    }
-
-    TestCase {
-        name: "testCase1"
-        when: windowShown
-
-        function init() {
-            console.debug(">> init");
-            console.debug("<< init");    
-        }
-
-        function cleanup() {
-            console.debug(">> cleanup");
-            console.debug("<< cleanup");
-        }
-
-        function initTestCase() {
-            console.debug(">> initTestCase");
-            console.debug("<< initTestCase");
-        }
-
-        function cleanupTestCase() {
-            console.debug(">> cleanupTestCase");
-            console.debug("<< cleanupTestCase");
-        }
-        
-        function test_exampleTest1() {
-            var expected = true;
-            var result = true;
-            compare(expected,result,"expected did not equal result");
-        }
-    }
-}
 
=== renamed directory 'qtcreator' => 'ubuntu-qtcreator-plugins'
=== added directory 'ubuntu-qtcreator-plugins/debian'
=== added file 'ubuntu-qtcreator-plugins/debian/qtcreator-plugin-ubuntu.install'
--- ubuntu-qtcreator-plugins/debian/qtcreator-plugin-ubuntu.install	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/debian/qtcreator-plugin-ubuntu.install	2013-06-10 18:40:33 +0000
@@ -0,0 +1,4 @@
+debian/ubuntusdk.desktop usr/share/applications
+usr/share/qtcreator/templates/wizards/ubuntu
+usr/share/qtcreator/ubuntu
+usr/lib/*/qtcreator/plugins/Canonical
 
=== added file 'ubuntu-qtcreator-plugins/debian/qtcreator.desktop'
--- ubuntu-qtcreator-plugins/debian/qtcreator.desktop	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/debian/qtcreator.desktop	2013-06-10 18:40:33 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Exec=qtcreator -noload Ubuntu %F
+Icon=QtProject-qtcreator
+Type=Application
+Terminal=false
+Name=Qt Creator
+GenericName=Integrated Development Environment
+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;
+Categories=Qt;Development;IDE;
+InitialPreference=9
 
=== added file 'ubuntu-qtcreator-plugins/debian/ubuntusdk.desktop'
--- ubuntu-qtcreator-plugins/debian/ubuntusdk.desktop	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/debian/ubuntusdk.desktop	2013-06-10 18:40:33 +0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Exec=qtcreator -noload Welcome %F
+Icon=QtProject-qtcreator
+Type=Application
+Terminal=false
+Name=Ubuntu SDK
+GenericName=Integrated Development Environment
+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;
+Categories=Qt;Development;IDE;
+InitialPreference=9
+Keywords=Ubuntu SDK;SDK;Ubuntu Touch
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/static.pro'
--- ubuntu-qtcreator-plugins/share/qtcreator/static.pro	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/static.pro	2013-06-10 18:40:33 +0000
@@ -0,0 +1,126 @@
+include(../../qtcreator.pri)
+
+TEMPLATE = app
+TARGET = phony_target
+CONFIG -= qt separate_debug_info gdb_dwarf_index
+QT =
+LIBS =
+macx:CONFIG -= app_bundle
+
+isEmpty(vcproj) {
+    QMAKE_LINK = @: IGNORE THIS LINE
+    OBJECTS_DIR =
+    win32:CONFIG -= embed_manifest_exe
+} else {
+    CONFIG += console
+    PHONY_DEPS = .
+    phony_src.input = PHONY_DEPS
+    phony_src.output = phony.c
+    phony_src.variable_out = GENERATED_SOURCES
+    phony_src.commands = echo int main() { return 0; } > phony.c
+    phony_src.name = CREATE phony.c
+    phony_src.CONFIG += combine
+    QMAKE_EXTRA_COMPILERS += phony_src
+}
+
+DATA_DIRS = \
+    welcomescreen \
+    examplebrowser \
+    snippets \
+    templates \
+    designer \
+    schemes \
+    styles \
+    rss \
+    dumper \
+    qmldesigner \
+    qmlicons \
+    qml \
+    qml-type-descriptions \
+    generic-highlighter \
+    glsl \
+    ubuntu
+
+macx: DATA_DIRS += scripts
+
+for(data_dir, DATA_DIRS) {
+    files = $$files($$PWD/$$data_dir/*, true)
+    win32:files ~= s|\\\\|/|g
+    for(file, files):!contains(file, ".*/Info\\.plist\\.in$"):!exists($$file/*):FILES += $$file
+}
+OTHER_FILES += $$FILES
+
+# conditionally deployed data
+!isEmpty(copydata) {
+    copy2build.input = FILES
+    copy2build.output = $$IDE_DATA_PATH/${QMAKE_FUNC_FILE_IN_stripSrcDir}
+    isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
+    win32:copy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
+    unix:copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copy2build.name = COPY ${QMAKE_FILE_IN}
+    copy2build.CONFIG += no_link
+    QMAKE_EXTRA_COMPILERS += copy2build
+}
+
+!macx {
+    for(data_dir, DATA_DIRS) {
+        eval($${data_dir}.files = $$quote($$PWD/$$data_dir))
+        eval($${data_dir}.path = $$QTC_PREFIX/share/qtcreator)
+        INSTALLS += $$data_dir
+    }
+} else {
+   # do version magic for app bundles
+   dumpinfo.input = qml/qmldump/Info.plist.in
+   dumpinfo.output = $$IDE_DATA_PATH/qml/qmldump/Info.plist
+   QMAKE_SUBSTITUTES += dumpinfo
+   observerinfo.input = qml/qmlobserver/Info.plist.in
+   observerinfo.output = $$IDE_DATA_PATH/qml/qmlobserver/Info.plist
+   QMAKE_SUBSTITUTES += observerinfo
+}
+
+SRCRESOURCEDIR = $$IDE_SOURCE_TREE/src/share/qtcreator/
+defineReplace(stripSrcResourceDir) {
+    win32 {
+        !contains(1, ^.:.*):1 = $$OUT_PWD/$$1
+    } else {
+        !contains(1, ^/.*):1 = $$OUT_PWD/$$1
+    }
+    out = $$cleanPath($$1)
+    out ~= s|^$$re_escape($$SRCRESOURCEDIR)||$$i_flag
+    return($$out)
+}
+
+# files that are to be unconditionally "deployed" to the build dir from src/share to share
+DATA_DIRS = \
+    externaltools
+DATA_FILES_SRC = \
+    externaltools/lrelease.xml \
+    externaltools/lupdate.xml \
+    externaltools/sort.xml \
+    externaltools/qmlviewer.xml \
+    externaltools/qmlscene.xml
+unix {
+    macx:DATA_FILES_SRC += externaltools/vi_mac.xml
+    else:DATA_FILES_SRC += externaltools/vi.xml
+} else {
+    DATA_FILES_SRC += externaltools/notepad_win.xml
+}
+for(file, DATA_FILES_SRC):DATA_FILES += $${SRCRESOURCEDIR}$$file
+OTHER_FILES += $$DATA_FILES
+unconditionalCopy2build.input = DATA_FILES
+unconditionalCopy2build.output = $$IDE_DATA_PATH/${QMAKE_FUNC_FILE_IN_stripSrcResourceDir}
+isEmpty(vcproj):unconditionalCopy2build.variable_out = PRE_TARGETDEPS
+win32:unconditionalCopy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
+unix:unconditionalCopy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+unconditionalCopy2build.name = COPY ${QMAKE_FILE_IN}
+unconditionalCopy2build.CONFIG += no_link
+QMAKE_EXTRA_COMPILERS += unconditionalCopy2build
+
+!macx {
+    for(data_dir, DATA_DIRS) {
+        eval($${data_dir}.files = $$IDE_DATA_PATH/$$data_dir)
+        eval($${data_dir}.path = $$QTC_PREFIX/share/qtcreator)
+        eval($${data_dir}.CONFIG += no_check_exist)
+        INSTALLS += $$data_dir
+    }
+}
 
=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/backend/backend.h'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/backend/backend.h	2013-04-23 14:15:56 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/backend/backend.h	2013-06-10 18:40:33 +0000
@@ -4,6 +4,27 @@
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlExtensionPlugin>
 
+/*
+ ----8<-----
+
+ import %DISPLAYNAME% 1.0
+
+ Rectangle {
+   width: 200
+   height: 200
+
+   MyType {
+      id: helloType
+   }
+
+   Text {
+     anchors.centerIn: parent
+     text: helloType.helloworld
+   }
+ }
+
+ -----8<------
+*/
 class BackendPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
 
=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/projectypes.json	2013-05-03 23:00:15 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json	2013-06-10 18:40:33 +0000
@@ -6,9 +6,28 @@
        "id": "UbuntuAppSimple",
        "description": "A simple Ubuntu UI with a Label and a Button",
        "mainFile" : "main.qml",
+       "hasTests" : true,
        "files": [
            {
                "fileName": "displayName.desktop"
+           },
+           {
+               "fileName": "tests/unit/tst_hellocomponent.qml"
+           },
+           {
+               "fileName": "components/HelloComponent.qml"
+           },
+           {
+               "fileName": "Makefile"
+           },
+           {
+               "fileName": "tests/autopilot/uitests/main/test_main.py"
+           },
+           {
+               "fileName": "tests/autopilot/uitests/__init__.py"
+           },
+           {
+               "fileName": "tests/autopilot/uitests/main/__init__.py"
            }
        ]
     },
@@ -19,12 +38,40 @@
        "id": "UbuntuAppTabs",
        "description": "A multi-page UI using the Tabs component",
        "mainFile" : "main.qml",
+       "hasTests" : true,
        "files": [
            {
-               "fileName": "[e-mail]"
+               "fileName": "graphics/[e-mail]"
            },
            {
                "fileName": "displayName.desktop"
+           },
+           {
+               "fileName": "tests/unit/tst_hellocomponent.qml"
+           },
+           {
+               "fileName": "components/HelloComponent.qml"
+           },
+           {
+               "fileName": "ui/WorldTabTools.qml"
+           },
+           {
+               "fileName": "ui/WorldTab.qml"
+           },
+           {
+               "fileName": "ui/HelloTab.qml"
+           },
+           {
+               "fileName": "Makefile"
+           },
+           {
+               "fileName": "tests/autopilot/uitests/main/test_main.py"
+           },
+           {
+               "fileName": "tests/autopilot/uitests/__init__.py"
+           },
+           {
+               "fileName": "tests/autopilot/uitests/main/__init__.py"
            }
        ]
     },
@@ -60,40 +107,5 @@
            { "fileName": "mytype.cpp" },
            { "fileName": "qmldir" }
        ]
-    },
-    {
-       "type": "qmlproject",
-       "folder": "unit",
-       "displayName": "Unit Test with QML",
-       "id": "UbuntuTestQML",
-       "description": "A QML based unit test case template",
-       "mainFile" : "tst_test.qml",
-       "files": [
-            {
-                "fileName": "Makefile"
-            }
-       ]
-    },
-    {
-       "type": "autopilotproject",
-       "folder": "autopilot",
-       "displayName": "Functional Tests with Autopilot",
-       "id": "UbuntuTestAutopilot",
-       "description": "A Python based functional test case template for a simple QML UI",
-       "mainFile" : "helloworld.qml",
-       "files": [
-           {
-               "fileName": "Makefile"
-           },
-           {
-               "fileName": "tests/qmluitests/Generic/test_helloworld.py"
-           },
-           {
-               "fileName": "tests/qmluitests/__init__.py"
-           },
-           {
-               "fileName": "tests/qmluitests/Generic/__init__.py"
-           }
-       ]
     }
 ]
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/Makefile'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/Makefile	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/Makefile	2013-06-10 18:40:33 +0000
@@ -0,0 +1,18 @@
+# More information: https://wiki.ubuntu.com/Touch/Testing
+#
+# Notes for autopilot tests:
+# -----------------------------------------------------------
+# In order to run autopilot tests:
+# sudo apt-add-repository ppa:autopilot/ppa
+# sudo apt-get update
+# sudo apt-get install python-autopilot autopilot-qt
+#############################################################
+
+autopilot:
+	cd tests/autopilot; autopilot run uitests
+
+check:
+	qmltestrunner -input tests/unit
+
+run:
+	/usr/bin/qmlscene $@ %DISPLAYNAME%.qml
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/components'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml	2013-06-10 18:40:33 +0000
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+UbuntuShape {
+    width: 200
+    height: width
+
+    property alias text : myText.text
+
+    Label {
+        id: myText
+        anchors.centerIn: parent
+    }
+}
 
=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/main.qml'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/simple/main.qml	2013-05-03 21:22:40 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/main.qml	2013-06-10 18:40:33 +0000
@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import "components"
 
 /*!
     \brief MainView with a Label and Button elements.
@@ -16,7 +17,7 @@
      This property enables the application to change orientation 
      when the device is rotated. The default is false.
     */
-    automaticOrientation: true
+    //automaticOrientation: true
 
     width: units.gu(100)
     height: units.gu(75)
@@ -31,12 +32,13 @@
                 fill: parent
             }
 
-            Label {
+            HelloComponent {
                 id: label
                 objectName: "label"
 
                 text: i18n.tr("Hello..")
             }
+
             Button {
                 objectName: "button"
                 width: parent.width
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests'
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot'
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/__init__.py'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/__init__.py	2013-06-10 18:40:33 +0000
@@ -0,0 +1,129 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""Ubuntu Touch App autopilot tests."""
+
+from os import remove
+import os.path
+from tempfile import mktemp
+import subprocess
+
+from autopilot.input import Mouse, Touch, Pointer
+from autopilot.matchers import Eventually
+from autopilot.platform import model
+from testtools.matchers import Is, Not, Equals
+from autopilot.testcase import AutopilotTestCase
+
+def get_module_include_path():
+    return os.path.abspath(
+        os.path.join(
+            os.path.dirname(__file__),
+            '..',
+            '..',
+            '..',
+            '..',
+            'modules')
+        )
+
+
+class UbuntuTouchAppTestCase(AutopilotTestCase):
+    """A common test case class that provides several useful methods for the tests."""
+
+    if model() == 'Desktop':
+        scenarios = [
+        ('with mouse', dict(input_device_class=Mouse))
+        ]
+    else:
+        scenarios = [
+        ('with touch', dict(input_device_class=Touch))
+        ]
+
+    @property
+    def main_window(self):
+        return MainWindow(self.app)
+
+
+    def setUp(self):
+        self.pointing_device = Pointer(self.input_device_class.create())
+        super(UbuntuTouchAppTestCase, self).setUp()
+        self.launch_test_qml()
+
+
+    def launch_test_qml(self):
+        # If the test class has defined a 'test_qml' class attribute then we
+        # write it to disk and launch it inside the QML Scene. If not, then we
+        # silently do nothing (presumably the test has something else planned).
+        arch = subprocess.check_output(["dpkg-architecture",
+        "-qDEB_HOST_MULTIARCH"]).strip()
+        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
+            qml_path = mktemp(suffix='.qml')
+            open(qml_path, 'w').write(self.test_qml)
+            self.addCleanup(remove, qml_path)
+
+            self.app = self.launch_test_application(
+                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
+                "-I", get_module_include_path(),
+                qml_path)
+
+        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
+            qml_path = self.test_qml_file
+            self.app = self.launch_test_application(
+                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
+                "-I", get_module_include_path(),
+                qml_path)
+
+        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
+
+
+    def get_qml_view(self):
+        """Get the main QML view"""
+
+        return self.app.select_single("QQuickView")
+
+    def get_mainview(self):
+        """Get the QML MainView"""
+
+        mainView = self.app.select_single("MainView")
+        self.assertThat(mainView, Not(Is(None)))
+        return mainView
+
+
+    def get_object(self,objectName):
+        """Get a object based on the objectName"""
+
+        obj = self.app.select_single(objectName=objectName)
+        self.assertThat(obj, Not(Is(None)))
+        return obj
+
+
+    def mouse_click(self,objectName):
+        """Move mouse on top of the object and click on it"""
+
+        obj = self.get_object(objectName)
+        self.pointing_device.move_to_object(obj)
+        self.pointing_device.click()
+
+
+    def mouse_press(self,objectName):
+        """Move mouse on top of the object and press mouse button (without releasing it)"""
+
+        obj = self.get_object(objectName)
+        self.pointing_device.move_to_object(obj)
+        self.pointing_device.press()
+
+
+    def mouse_release(self):
+        """Release mouse button"""
+
+        self.pointing_device.release()     
+
+
+    def type_string(self, string):
+        """Type a string with keyboard"""
+
+        self.keyboard.type(string)
+
+
+    def type_key(self, key):
+        """Type a single key with keyboard"""
+
+        self.keyboard.key(key)
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/__init__.py'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/__init__.py	2013-06-10 18:40:33 +0000
@@ -0,0 +1,1 @@
+""" A Generic test suite """
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/test_main.py'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/test_main.py	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/uitests/main/test_main.py	2013-06-10 18:40:33 +0000
@@ -0,0 +1,38 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""Tests for the Hello World"""
+
+from autopilot.matchers import Eventually
+from textwrap import dedent
+from testtools.matchers import Is, Not, Equals
+from testtools import skip
+import os
+from uitests import HelloWorldTestCase
+
+
+class GenericTests(HelloWorldTestCase):
+    """Generic tests for the Hello World"""
+
+    test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../%DISPLAYNAME%")
+
+    def test_0_can_select_mainView(self):
+        """Must be able to select the mainview."""
+
+        mainView = self.get_mainview()
+        self.assertThat(mainView.visible,Eventually(Equals(True)))
+
+
+    def test_1_init_label(self):
+        """Check the initial text of the label"""
+
+        lbl = self.get_object(objectName="label")
+        self.assertThat(lbl.text, Equals("Hello.."))
+
+
+    def test_can_tap_button(self):
+        """Must be able to tap the button"""
+
+        lbl = self.get_object(objectName="label")
+        self.mouse_click(objectName="button")
+        self.assertThat(lbl.text, Eventually(Equals("..world!")))
+
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/unit'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/unit/tst_hellocomponent.qml'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/unit/tst_hellocomponent.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/simple/tests/unit/tst_hellocomponent.qml	2013-06-10 18:40:33 +0000
@@ -0,0 +1,49 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Components 0.1
+import "../../components"
+
+// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
+
+// Execute tests with:
+//   qmltestrunner
+
+Item {
+    // The objects
+    HelloComponent {
+        id: objectUnderTest
+    }
+
+    TestCase {
+        name: "HelloComponent"
+
+        function init() {
+            console.debug(">> init");
+            compare("",objectUnderTest.text,"text was not empty on init");
+            console.debug("<< init");    
+        }
+
+        function cleanup() {
+            console.debug(">> cleanup");
+            console.debug("<< cleanup");
+        }
+
+        function initTestCase() {
+            console.debug(">> initTestCase");
+            console.debug("<< initTestCase");
+        }
+
+        function cleanupTestCase() {
+            console.debug(">> cleanupTestCase");
+            console.debug("<< cleanupTestCase");
+        }
+        
+        function test_canReadAndWriteText() {
+            var expected = "Hello World";
+
+            objectUnderTest.text = expected;
+
+            compare(expected,objectUnderTest.text,"expected did not equal result");
+        }
+    }
+}
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/Makefile'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/Makefile	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/Makefile	2013-06-10 18:40:33 +0000
@@ -0,0 +1,18 @@
+# More information: https://wiki.ubuntu.com/Touch/Testing
+#
+# Notes for autopilot tests:
+# -----------------------------------------------------------
+# In order to run autopilot tests:
+# sudo apt-add-repository ppa:autopilot/ppa
+# sudo apt-get update
+# sudo apt-get install python-autopilot autopilot-qt
+#############################################################
+
+autopilot:
+	cd tests/autopilot; autopilot run uitests
+
+check:
+	qmltestrunner -input tests/unit
+
+run:
+	/usr/bin/qmlscene $@ %DISPLAYNAME%.qml
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/components'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/components/HelloComponent.qml'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/components/HelloComponent.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/components/HelloComponent.qml	2013-06-10 18:40:33 +0000
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+UbuntuShape {
+    width: 200
+    height: width
+
+    property alias text : myText.text
+
+    Label {
+        id: myText
+        anchors.centerIn: parent
+    }
+}
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/graphics'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/graphics/[e-mail]'
 Binary files ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/graphics/[e-mail]	2013-06-10 18:40:33 +0000 differ
=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/main.qml'
--- qtcreator/share/qtcreator/templates/wizards/ubuntu/tabs/main.qml	2013-04-26 17:51:04 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/main.qml	2013-06-10 18:40:33 +0000
@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import "ui"
 
 /*!
     \brief MainView with Tabs element.
@@ -18,7 +19,7 @@
      This property enables the application to change orientation 
      when the device is rotated. The default is false.
     */
-    automaticOrientation: true
+    //automaticOrientation: true
 
     width: units.gu(100)
     height: units.gu(75)
@@ -26,52 +27,12 @@
     Tabs {
         id: tabs
 
-        // First tab begins here
-        Tab {
-            objectName: "Tab1"
-
-            title: i18n.tr("Hello..")
-
-            // Tab content begins here
-            page: Page {
-                Column {
-                    anchors.centerIn: parent
-                    Label {
-                        text: i18n.tr("Swipe from right to left to change tab.")
-                    }
-                }
-            }
+        HelloTab {
+            objectName: "helloTab"
         }
 
-        // Second tab begins here
-        Tab {
-            objectName: "Tab2"
-
-            title: i18n.tr("..Toolbar!")
-            page: Page {
-                tools: ToolbarActions {
-                    Action {
-                        objectName: "action"
-
-                        iconSource: Qt.resolvedUrl("toolbarIcon.png")
-                        text: i18n.tr("Tap me!")
-
-                        onTriggered: {
-                            label.text = i18n.tr("Toolbar tapped")
-                        }
-                    }
-                }
-
-                Column {
-                    anchors.centerIn: parent
-                    Label {
-                        id: label
-                        objectName: "label"
-
-                        text: i18n.tr("Swipe from bottom to up to reveal the toolbar.")
-                    }
-                }
-            }
+        WorldTab {
+            objectName: "worldTab"
         }
     }
 }
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests'
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot'
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/__init__.py'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/__init__.py	2013-06-10 18:40:33 +0000
@@ -0,0 +1,129 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""Ubuntu Touch App autopilot tests."""
+
+from os import remove
+import os.path
+from tempfile import mktemp
+import subprocess
+
+from autopilot.input import Mouse, Touch, Pointer
+from autopilot.matchers import Eventually
+from autopilot.platform import model
+from testtools.matchers import Is, Not, Equals
+from autopilot.testcase import AutopilotTestCase
+
+def get_module_include_path():
+    return os.path.abspath(
+        os.path.join(
+            os.path.dirname(__file__),
+            '..',
+            '..',
+            '..',
+            '..',
+            'modules')
+        )
+
+
+class UbuntuTouchAppTestCase(AutopilotTestCase):
+    """A common test case class that provides several useful methods for the tests."""
+
+    if model() == 'Desktop':
+        scenarios = [
+        ('with mouse', dict(input_device_class=Mouse))
+        ]
+    else:
+        scenarios = [
+        ('with touch', dict(input_device_class=Touch))
+        ]
+
+    @property
+    def main_window(self):
+        return MainWindow(self.app)
+
+
+    def setUp(self):
+        self.pointing_device = Pointer(self.input_device_class.create())
+        super(UbuntuTouchAppTestCase, self).setUp()
+        self.launch_test_qml()
+
+
+    def launch_test_qml(self):
+        # If the test class has defined a 'test_qml' class attribute then we
+        # write it to disk and launch it inside the QML Scene. If not, then we
+        # silently do nothing (presumably the test has something else planned).
+        arch = subprocess.check_output(["dpkg-architecture",
+        "-qDEB_HOST_MULTIARCH"]).strip()
+        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
+            qml_path = mktemp(suffix='.qml')
+            open(qml_path, 'w').write(self.test_qml)
+            self.addCleanup(remove, qml_path)
+
+            self.app = self.launch_test_application(
+                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
+                "-I", get_module_include_path(),
+                qml_path)
+
+        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
+            qml_path = self.test_qml_file
+            self.app = self.launch_test_application(
+                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
+                "-I", get_module_include_path(),
+                qml_path)
+
+        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
+
+
+    def get_qml_view(self):
+        """Get the main QML view"""
+
+        return self.app.select_single("QQuickView")
+
+    def get_mainview(self):
+        """Get the QML MainView"""
+
+        mainView = self.app.select_single("MainView")
+        self.assertThat(mainView, Not(Is(None)))
+        return mainView
+
+
+    def get_object(self,objectName):
+        """Get a object based on the objectName"""
+
+        obj = self.app.select_single(objectName=objectName)
+        self.assertThat(obj, Not(Is(None)))
+        return obj
+
+
+    def mouse_click(self,objectName):
+        """Move mouse on top of the object and click on it"""
+
+        obj = self.get_object(objectName)
+        self.pointing_device.move_to_object(obj)
+        self.pointing_device.click()
+
+
+    def mouse_press(self,objectName):
+        """Move mouse on top of the object and press mouse button (without releasing it)"""
+
+        obj = self.get_object(objectName)
+        self.pointing_device.move_to_object(obj)
+        self.pointing_device.press()
+
+
+    def mouse_release(self):
+        """Release mouse button"""
+
+        self.pointing_device.release()     
+
+
+    def type_string(self, string):
+        """Type a string with keyboard"""
+
+        self.keyboard.type(string)
+
+
+    def type_key(self, key):
+        """Type a single key with keyboard"""
+
+        self.keyboard.key(key)
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/__init__.py'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/__init__.py	2013-06-10 18:40:33 +0000
@@ -0,0 +1,1 @@
+""" A main.qml test suite """
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/test_main.py'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/test_main.py	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/uitests/main/test_main.py	2013-06-10 18:40:33 +0000
@@ -0,0 +1,23 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""Tests for the Hello World"""
+
+from autopilot.matchers import Eventually
+from textwrap import dedent
+from testtools.matchers import Is, Not, Equals
+from testtools import skip
+import os
+from uitests import UbuntuTouchAppTestCase
+
+
+class MainTests(UbuntuTouchAppTestCase):
+    """Generic tests for the Hello World"""
+
+    test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../%DISPLAYNAME%")
+
+    def test_0_can_select_mainView(self):
+        """Must be able to select the mainview."""
+
+        mainView = self.get_mainview()
+        self.assertThat(mainView.visible,Eventually(Equals(True)))
+
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit/tst_hellocomponent.qml'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit/tst_hellocomponent.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit/tst_hellocomponent.qml	2013-06-10 18:40:33 +0000
@@ -0,0 +1,49 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Components 0.1
+import "../../components"
+
+// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
+
+// Execute tests with:
+//   qmltestrunner
+
+Item {
+    // The objects
+    HelloComponent {
+        id: objectUnderTest
+    }
+
+    TestCase {
+        name: "HelloComponent"
+
+        function init() {
+            console.debug(">> init");
+            compare("",objectUnderTest.text,"text was not empty on init");
+            console.debug("<< init");    
+        }
+
+        function cleanup() {
+            console.debug(">> cleanup");
+            console.debug("<< cleanup");
+        }
+
+        function initTestCase() {
+            console.debug(">> initTestCase");
+            console.debug("<< initTestCase");
+        }
+
+        function cleanupTestCase() {
+            console.debug(">> cleanupTestCase");
+            console.debug("<< cleanupTestCase");
+        }
+        
+        function test_canReadAndWriteText() {
+            var expected = "Hello World";
+
+            objectUnderTest.text = expected;
+
+            compare(expected,objectUnderTest.text,"expected did not equal result");
+        }
+    }
+}
 
=== added directory 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui'
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/HelloTab.qml'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/HelloTab.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/HelloTab.qml	2013-06-10 18:40:33 +0000
@@ -0,0 +1,30 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "../components"
+
+Tab {
+    title: i18n.tr("Hello..")
+
+    page: Page {
+        Column {
+            spacing: units.gu(2)
+            anchors.centerIn: parent
+
+            HelloComponent {
+                objectName: "helloTab_HelloComponent"
+
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                text: i18n.tr("HelloTab")
+            }
+
+            Label {
+                objectName: "helloTab_label"
+
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                text: i18n.tr("You can change the Tab from Page title above.")
+            }
+        }
+    }
+}
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTab.qml'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTab.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTab.qml	2013-06-10 18:40:33 +0000
@@ -0,0 +1,35 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "../components"
+
+Tab {
+    title: i18n.tr("..World!")
+
+    page: Page {
+        tools: WorldTabTools {
+            objectName: "worldTab_tools"
+        }
+
+        Column {
+            spacing: units.gu(2)
+            anchors.centerIn: parent
+
+            HelloComponent {
+                objectName: "worldTab_HelloComponent"
+
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                text: i18n.tr("WorldTab")
+            }
+
+            Label {
+                id: label
+                objectName: "worldTab_label"
+
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                text: i18n.tr("Swipe from bottom to up to reveal the toolbar.")
+            }
+        }
+    }
+}
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTabTools.qml'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTabTools.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTabTools.qml	2013-06-10 18:40:33 +0000
@@ -0,0 +1,13 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+ToolbarActions {
+    Action {
+        iconSource: Qt.resolvedUrl("../graphics/toolbarIcon.png")
+        text: i18n.tr("Tap me!")
+
+        onTriggered: {
+            label.text = i18n.tr("Toolbar tapped")
+        }
+    }
+}
 
=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json'
--- qtcreator/share/qtcreator/ubuntu/menu.json	2013-05-04 21:41:03 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json	2013-06-10 18:40:33 +0000
@@ -139,6 +139,13 @@
         "id": "Ubuntu.Menu",
         "parent": "Tools",
         "submenu": [
+             {
+                "name": "Ubuntu Touch Showcase Gallery",
+                "id": "Ubuntu.Menu.Showcase",
+                "actions": [
+                    "%SCRIPTDIRECTORY%/qtc_launch_gallery"
+                ]
+            },
             {
                 "name": "Translations",
                 "id": "Ubuntu.Menu.i18n",
 
=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_search'
--- qtcreator/share/qtcreator/ubuntu/scripts/device_search	2013-05-02 00:47:53 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_search	2013-06-10 18:40:33 +0000
@@ -15,5 +15,6 @@
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
 set -e;
-
+adb kill-server &> /dev/null
+adb start-server &> /dev/null
 adb devices -l
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery	2013-06-10 18:40:33 +0000
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/bin/qmlscene $@ /usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml &
 
=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_project_packaging'
--- qtcreator/share/qtcreator/ubuntu/scripts/qtc_project_packaging	2013-04-25 08:45:39 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_project_packaging	2013-06-10 18:40:33 +0000
@@ -1,3 +1,4 @@
+
 #!/bin/bash
 # Copyright 2013 Canonical Ltd.
 #
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings	2013-06-10 18:40:33 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+DEBEMAIL=`grep -G "^DEBEMAIL" ~/.bashrc`
+DEBFULLNAME=`grep -G "^DEBFULLNAME" ~/.bashrc`
+
+if [[ ! -z "$DEBEMAIL" ]]; then
+  export $DEBEMAIL
+else
+  CMD=`grep -G "export DEBEMAIL=" ~/.bashrc|sed "s/\"//g"`
+  if [[ ! -z $CMD ]]; then
+    $CMD
+  fi
+fi
+if [[ ! -z $DEBFULLNAME ]]; then
+  export $DEBFULLNAME
+else
+  CMD=`grep -G "export DEBFULLNAME=" ~/.bashrc|sed "s/\"//g"|sed "s/export DEBFULLNAME=//g"`
+  if [[ ! -z $CMD ]]; then
+    export DEBFULLNAME="$CMD"
+  fi
+fi
+
+echo $DEBFULLNAME
+echo $DEBEMAIL
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/Link.qml'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/Link.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/Link.qml	2013-06-10 18:40:33 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Juhapekka Piiroinen <[e-mail]>
+ */
+
+import QtQuick 1.0
+
+Rectangle {
+    width: linkTitle.paintedWidth
+    height: 60
+    color: "transparent"
+    opacity: 0.8
+
+    property alias title : linkTitle.text
+    property url link
+    property color defaultColor : "#DD4814"
+    property color hoverColor : "#eee"
+
+    Rectangle {
+        id: background
+        color: hoverColor
+        opacity: 0
+        anchors.fill: parent
+
+        Behavior on opacity {
+            NumberAnimation { duration: 250 }
+        }
+    }
+
+    Text {
+        id: linkTitle
+        anchors.centerIn: parent
+        wrapMode: Text.WordWrap
+        width: parent.width - 20
+        font.family: "Ubuntu"
+        font.pixelSize: 20
+        font.letterSpacing: 1.5
+        color: defaultColor
+        font.weight: Font.Light
+        textFormat: Text.RichText
+        text: ""
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        hoverEnabled: true
+
+        onEntered: {
+            background.opacity = 1;
+        }
+        onExited: {
+            background.opacity = 0;
+        }
+
+        onClicked: {
+            Qt.openUrlExternally(link);
+        }
+        onPressed: {
+            linkTitle.color = Qt.lighter(defaultColor);
+        }
+        onReleased: {
+            linkTitle.color = defaultColor;
+        }
+    }
+
+}
 
=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/NewsBox.qml'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/NewsBox.qml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/NewsBox.qml	2013-06-10 18:40:33 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Juhapekka Piiroinen <[e-mail]>
+ */
+import QtQuick 2.0
+import QtQuick.XmlListModel 2.0
+
+ListView {
+
+    clip: true
+
+    property url link
+
+    model: XmlListModel {
+        source: link
+        query: "/rss/channel/item"
+
+        XmlRole { name: "title"; query: "title/string()" }
+        XmlRole { name: "link"; query: "link/string()" }
+        XmlRole { name: "description"; query: "description/string()" }
+        XmlRole { name: "pubDate"; query: "pubDate/string()" }
+    }
+    delegate: Item {
+        id: delegate
+        height: itemContent.height+ 20
+        width: delegate.ListView.view.width
+        Column {
+            id: itemContent
+            width: parent.width
+            Text {
+                text: pubDate
+                font.pixelSize: 10
+                font.family: "Ubuntu"
+                font.weight: Font.Light
+            }
+
+            Text {
+                text: title
+                font.family: "Ubuntu"
+                font.pixelSize: 20
+                font.letterSpacing: 1.5
+                wrapMode: Text.WordWrap
+                font.weight: Font.Light
+                width: parent.width
+            }
+
+            Text {
+                text: description
+                font.family: "Ubuntu"
+                font.pixelSize: 12
+                wrapMode: Text.WordWrap
+                font.weight: Font.Light
+                font.letterSpacing: 1.5
+                width: parent.width
+                textFormat: Text.RichText
+            }
+        }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                Qt.openUrlExternally(linkText)
+            }
+        }
+    }
+
+}
 
=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/welcome.qml'
--- qtcreator/share/qtcreator/ubuntu/welcome/welcome.qml	2013-04-08 13:34:07 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/welcome/welcome.qml	2013-06-10 18:40:33 +0000
@@ -18,9 +18,13 @@
 
 import QtQuick 1.1
 
+
 Rectangle {
     color: "#F7F6F5"
 
+    width: maximumWidth
+    height: maximumHeight
+
     property int maximumWidth : 900
     property int maximumHeight: 579
 
@@ -31,16 +35,20 @@
     }
 
     Rectangle {
-        anchors.centerIn: parent
+        anchors.horizontalCenter: parent.horizontalCenter
+        // Commented out until we get Qt 5.1
+        /*anchors.top: parent.top
+        anchors.bottom: parent.bottom*/
+        anchors.verticalCenter: parent.verticalCenter
+        height: maximumHeight
         width: parent.width>maximumWidth ? maximumWidth : parent.width
-        height: (parent.height>maximumHeight ? maximumHeight : parent.height) / 1.2
-        color: "#FFF"
+        color: "#fff"
 
         Image {
-            anchors.verticalCenter: parent.verticalCenter
+            anchors.top: parent.top
+            anchors.topMargin: 10
             anchors.right: parent.right
             source: "images/devices.png"
-            height: parent.height
             width: parent.width/2
             fillMode: Image.PreserveAspectFit
         }
@@ -49,11 +57,13 @@
             color: "transparent"
             anchors.margins: 20
             anchors.top: parent.top
+            anchors.topMargin: 40
             anchors.bottom: parent.bottom
             anchors.horizontalCenter: parent.horizontalCenter
             width: parent.width - anchors.margins*2
 
             Column {
+                id: headerColumn
                 spacing: 20
                 anchors.top: parent.top
                 anchors.left: parent.left
@@ -81,42 +91,29 @@
             }
 
             Column {
-                   anchors.verticalCenter: parent.verticalCenter
-                    spacing: 5
-                    Text {
-                        wrapMode: Text.WordWrap
+                id: topLinks
+                anchors.topMargin: 50
+                anchors.top: headerColumn.bottom
+                width: parent.width
+                spacing: 5
+
+                    Link {
                         width: parent.width
-                        font.family: "Ubuntu"
-                        font.pixelSize: 20
-                        font.letterSpacing: 1.5
-                        font.weight: Font.Light
-                        textFormat: Text.RichText
-                        text: "<a style=\"text-decoration: none; color: #DD4814\" href=\"http://design.ubuntu.com/apps\">Design something beautiful &gt;</a>"
-                        onLinkActivated: {
-                            Qt.openUrlExternally(link);
-                        }
+                        title: "Design something beautiful &gt;"
+                        link: "http://design.ubuntu.com/apps"
                     }
 
-                    Text {
-                        id: demo
-                        wrapMode: Text.WordWrap
+                    Link {
                         width: parent.width
-                        font.family: "Ubuntu"
-                        font.pixelSize: 20
-                        font.letterSpacing: 1.5
-                        font.weight: Font.Light
-                        textFormat: Text.RichText
-                        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>"
-                        onLinkActivated: {
-                            Qt.openUrlExternally(link);
-                        }
-
+                        title: "Build something solid &gt;"
+                        link: "http://developer.ubuntu.com/api/ubuntu-12.10/qml/mobile/overview-ubuntu-sdk.html"
                     }
             }
-
             Column {
-                anchors.bottom: parent.bottom
+                id: bottomBox
+                anchors.top: topLinks.bottom
                 anchors.left: parent.left
+                anchors.topMargin: 20
 
                     width: parent.width
                     spacing: 5
@@ -134,15 +131,45 @@
                         width: parent.width
                         font.family: "Ubuntu"
                         font.pixelSize: 18
+                         textFormat: Text.RichText
                         font.weight: Font.Light
-                        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."
+                        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."
                         onLinkActivated: {
                             Qt.openUrlExternally(link);
                         }
                     }
-
             }
 
+           /*
+        Commented out until we get Qt 5.1
+
+            Row {
+                anchors.top: bottomBox.bottom
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+                anchors.margins: 10
+                anchors.topMargin: 20
+                spacing: 20
+
+                NewsBox {
+                    height: parent.height
+                    width: parent.width/2
+
+                    link: "http://developer.ubuntu.com/feed/"
+                }
+
+                NewsBox {
+                    height: parent.height
+                    width: parent.width/2
+
+                    link: "http://developer.ubuntu.com/category/event/feed/"
+                }
+            }*/
+
+
+
+
         }
     }
 }
 
=== added file 'ubuntu-qtcreator-plugins/src/plugins/plugins.pro'
--- ubuntu-qtcreator-plugins/src/plugins/plugins.pro	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/plugins.pro	2013-06-10 18:40:33 +0000
@@ -0,0 +1,361 @@
+# USE .subdir AND .depends !
+# OTHERWISE PLUGINS WILL BUILD IN WRONG ORDER (DIRECTORIES ARE COMPILED IN PARALLEL)
+
+TEMPLATE  = subdirs
+
+SUBDIRS   = plugin_coreplugin \
+            plugin_welcome \
+            plugin_find \
+            plugin_texteditor \
+            plugin_cppeditor \
+            plugin_bineditor \
+            plugin_diffeditor \
+            plugin_imageviewer \
+            plugin_bookmarks \
+            plugin_projectexplorer \
+            plugin_vcsbase \
+            plugin_perforce \
+            plugin_subversion \
+            plugin_git \
+            plugin_cvs \
+            plugin_cpptools \
+            plugin_qtsupport \
+            plugin_qt4projectmanager \
+            plugin_locator \
+            plugin_debugger \
+            plugin_help \
+            plugin_cpaster \
+            plugin_cmakeprojectmanager \
+            plugin_autotoolsprojectmanager \
+            plugin_fakevim \
+            plugin_designer \
+            plugin_resourceeditor \
+            plugin_genericprojectmanager \
+            plugin_qmljseditor \
+            plugin_glsleditor \
+            plugin_mercurial \
+            plugin_bazaar \
+            plugin_classview \
+            plugin_tasklist \
+            plugin_analyzerbase \
+            plugin_qmljstools \
+            plugin_macros \
+            debugger/dumper.pro \
+            plugin_remotelinux \
+            plugin_android \
+            plugin_madde \
+            plugin_valgrind \
+            plugin_todo \
+            plugin_qnx \
+            plugin_ubuntu
+
+exists(../shared/qbs/qbs.pro):SUBDIRS += plugin_qbsprojectmanager
+
+isEmpty(IDE_PACKAGE_MODE) {
+    SUBDIRS += plugin_helloworld \
+               plugin_updateinfo
+} else:!isEmpty(UPDATEINFO_ENABLE) {
+    SUBDIRS += plugin_updateinfo
+}
+linux-* {
+     SUBDIRS += debugger/ptracepreload.pro
+}
+!macx:SUBDIRS += plugin_clearcase
+
+include(../../qtcreator.pri)
+
+contains(QT_CONFIG, declarative)|!isEmpty(QT.declarative.name) {
+    SUBDIRS += \
+            plugin_qmlprojectmanager \
+            plugin_qmlprofiler
+
+    greaterThan(QT_MAJOR_VERSION, 4) {
+        SUBDIRS += plugin_qmldesigner
+    } else {
+        include(../private_headers.pri)
+        exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
+                SUBDIRS += plugin_qmldesigner
+        } else {
+            warning("QmlDesigner plugin has been disabled.")
+            warning("The plugin depends on private headers from QtDeclarative module.")
+            warning("To enable it, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
+        }
+    }
+} else {
+    warning("QmlProjectManager, QmlProfiler and QmlDesigner plugins have been disabled: The plugins require QtDeclarative");
+}
+
+include (debugger/lldb/guest/qtcreator-lldb.pri)
+
+plugin_coreplugin.subdir = coreplugin
+
+plugin_updateinfo.subdir = updateinfo
+plugin_updateinfo.depends = plugin_coreplugin
+
+plugin_welcome.subdir = welcome
+plugin_welcome.depends = plugin_coreplugin
+plugin_welcome.depends += plugin_projectexplorer
+
+plugin_find.subdir = find
+plugin_find.depends += plugin_coreplugin
+
+plugin_texteditor.subdir = texteditor
+plugin_texteditor.depends = plugin_find
+plugin_texteditor.depends += plugin_locator
+plugin_texteditor.depends += plugin_coreplugin
+
+plugin_cppeditor.subdir = cppeditor
+plugin_cppeditor.depends = plugin_texteditor
+plugin_cppeditor.depends += plugin_coreplugin
+plugin_cppeditor.depends += plugin_cpptools
+
+plugin_bineditor.subdir = bineditor
+plugin_bineditor.depends = plugin_texteditor
+plugin_bineditor.depends += plugin_coreplugin
+
+plugin_diffeditor.subdir = diffeditor
+plugin_diffeditor.depends = plugin_texteditor
+plugin_diffeditor.depends += plugin_coreplugin
+
+plugin_imageviewer.subdir = imageviewer
+plugin_imageviewer.depends = plugin_coreplugin
+
+plugin_designer.subdir = designer
+plugin_designer.depends = plugin_coreplugin plugin_cpptools plugin_projectexplorer plugin_texteditor
+
+plugin_vcsbase.subdir = vcsbase
+plugin_vcsbase.depends = plugin_find
+plugin_vcsbase.depends += plugin_texteditor
+plugin_vcsbase.depends += plugin_coreplugin
+plugin_vcsbase.depends += plugin_projectexplorer
+plugin_vcsbase.depends += plugin_cpptools
+
+plugin_perforce.subdir = perforce
+plugin_perforce.depends = plugin_vcsbase
+plugin_perforce.depends += plugin_projectexplorer
+plugin_perforce.depends += plugin_coreplugin
+
+plugin_git.subdir = git
+plugin_git.depends = plugin_vcsbase
+plugin_git.depends += plugin_projectexplorer
+plugin_git.depends += plugin_coreplugin
+
+plugin_cvs.subdir = cvs
+plugin_cvs.depends = plugin_vcsbase
+plugin_cvs.depends += plugin_projectexplorer
+plugin_cvs.depends += plugin_coreplugin
+
+plugin_subversion.subdir = subversion
+plugin_subversion.depends = plugin_vcsbase
+plugin_subversion.depends += plugin_projectexplorer
+plugin_subversion.depends += plugin_coreplugin
+
+plugin_projectexplorer.subdir = projectexplorer
+plugin_projectexplorer.depends = plugin_locator
+plugin_projectexplorer.depends += plugin_find
+plugin_projectexplorer.depends += plugin_coreplugin
+plugin_projectexplorer.depends += plugin_texteditor
+
+plugin_qtsupport.subdir = qtsupport
+plugin_qtsupport.depends = plugin_projectexplorer
+
+plugin_qt4projectmanager.subdir = qt4projectmanager
+plugin_qt4projectmanager.depends = plugin_texteditor
+plugin_qt4projectmanager.depends += plugin_projectexplorer
+plugin_qt4projectmanager.depends += plugin_qtsupport
+plugin_qt4projectmanager.depends += plugin_cpptools
+plugin_qt4projectmanager.depends += plugin_debugger
+plugin_qt4projectmanager.depends += plugin_qmljseditor
+plugin_qt4projectmanager.depends += plugin_qmljstools
+
+plugin_remotelinux.subdir = remotelinux
+plugin_remotelinux.depends += plugin_coreplugin
+plugin_remotelinux.depends += plugin_debugger
+plugin_remotelinux.depends += plugin_projectexplorer
+plugin_remotelinux.depends += plugin_qtsupport
+
+plugin_android.subdir = android
+plugin_android.depends = plugin_coreplugin
+plugin_android.depends += plugin_debugger
+plugin_android.depends += plugin_projectexplorer
+plugin_android.depends += plugin_qt4projectmanager
+
+plugin_madde.subdir = madde
+plugin_madde.depends += plugin_remotelinux
+plugin_madde.depends += plugin_qt4projectmanager
+
+plugin_locator.subdir = locator
+plugin_locator.depends = plugin_coreplugin
+
+plugin_cpptools.subdir = cpptools
+plugin_cpptools.depends = plugin_projectexplorer
+plugin_cpptools.depends += plugin_coreplugin
+plugin_cpptools.depends += plugin_texteditor
+plugin_cpptools.depends += plugin_find
+
+plugin_bookmarks.subdir = bookmarks
+plugin_bookmarks.depends = plugin_projectexplorer
+plugin_bookmarks.depends += plugin_coreplugin
+plugin_bookmarks.depends += plugin_texteditor
+
+plugin_debugger.subdir = debugger
+plugin_debugger.depends = plugin_projectexplorer
+plugin_debugger.depends += plugin_coreplugin
+plugin_debugger.depends += plugin_cpptools
+
+plugin_fakevim.subdir = fakevim
+plugin_fakevim.depends = plugin_coreplugin
+plugin_fakevim.depends += plugin_texteditor
+
+plugin_qtestlib.subdir = qtestlib
+plugin_qtestlib.depends = plugin_projectexplorer
+plugin_qtestlib.depends += plugin_coreplugin
+
+plugin_helloworld.subdir = helloworld
+plugin_helloworld.depends = plugin_coreplugin
+
+plugin_help.subdir = help
+plugin_help.depends = plugin_find
+plugin_help.depends += plugin_locator
+plugin_help.depends += plugin_coreplugin
+
+plugin_resourceeditor.subdir = resourceeditor
+plugin_resourceeditor.depends = plugin_coreplugin
+plugin_resourceeditor.depends = plugin_find
+
+plugin_regexp.subdir = regexp
+plugin_regexp.depends = plugin_coreplugin
+
+plugin_cpaster.subdir = cpaster
+plugin_cpaster.depends = plugin_texteditor
+plugin_cpaster.depends += plugin_coreplugin
+
+plugin_cmakeprojectmanager.subdir = cmakeprojectmanager
+plugin_cmakeprojectmanager.depends = plugin_texteditor
+plugin_cmakeprojectmanager.depends += plugin_projectexplorer
+plugin_cmakeprojectmanager.depends += plugin_cpptools
+plugin_cmakeprojectmanager.depends += plugin_qtsupport
+
+plugin_autotoolsprojectmanager.subdir = autotoolsprojectmanager
+plugin_autotoolsprojectmanager.depends = plugin_projectexplorer
+plugin_autotoolsprojectmanager.depends += plugin_coreplugin
+plugin_autotoolsprojectmanager.depends += plugin_cpptools
+plugin_autotoolsprojectmanager.depends += plugin_qtsupport
+
+plugin_genericprojectmanager.subdir = genericprojectmanager
+plugin_genericprojectmanager.depends = plugin_texteditor
+plugin_genericprojectmanager.depends += plugin_projectexplorer
+plugin_genericprojectmanager.depends += plugin_cpptools
+plugin_genericprojectmanager.depends += plugin_qtsupport
+
+plugin_qmljseditor.subdir = qmljseditor
+plugin_qmljseditor.depends = plugin_texteditor
+plugin_qmljseditor.depends += plugin_coreplugin
+plugin_qmljseditor.depends += plugin_projectexplorer
+plugin_qmljseditor.depends += plugin_qmljstools
+
+plugin_glsleditor.subdir = glsleditor
+plugin_glsleditor.depends = plugin_texteditor
+plugin_glsleditor.depends += plugin_coreplugin
+plugin_glsleditor.depends += plugin_projectexplorer
+plugin_glsleditor.depends += plugin_cpptools
+
+plugin_qmlprojectmanager.subdir = qmlprojectmanager
+plugin_qmlprojectmanager.depends = plugin_texteditor
+plugin_qmlprojectmanager.depends += plugin_projectexplorer
+plugin_qmlprojectmanager.depends += plugin_qmljseditor
+plugin_qmlprojectmanager.depends += plugin_qmljstools
+plugin_qmlprojectmanager.depends += plugin_debugger
+plugin_qmlprojectmanager.depends += plugin_qtsupport
+
+plugin_qmldesigner.subdir = qmldesigner
+plugin_qmldesigner.depends = plugin_coreplugin
+plugin_qmldesigner.depends += plugin_texteditor
+plugin_qmldesigner.depends += plugin_qmljseditor
+plugin_qmldesigner.depends += plugin_projectexplorer
+plugin_qmldesigner.depends += plugin_qt4projectmanager
+plugin_qmldesigner.depends += plugin_qmlprojectmanager
+plugin_qmldesigner.depends += plugin_cpptools
+
+plugin_mercurial.subdir = mercurial
+plugin_mercurial.depends = plugin_vcsbase
+plugin_mercurial.depends += plugin_projectexplorer
+plugin_mercurial.depends += plugin_coreplugin
+
+plugin_bazaar.subdir = bazaar
+plugin_bazaar.depends = plugin_vcsbase
+plugin_bazaar.depends += plugin_projectexplorer
+plugin_bazaar.depends += plugin_coreplugin
+
+plugin_classview.subdir = classview
+plugin_classview.depends = plugin_coreplugin
+plugin_classview.depends += plugin_cpptools
+plugin_classview.depends += plugin_projectexplorer
+plugin_classview.depends += plugin_texteditor
+
+plugin_tasklist.subdir = tasklist
+plugin_tasklist.depends = plugin_coreplugin
+plugin_tasklist.depends += plugin_projectexplorer
+
+plugin_analyzerbase.subdir = analyzerbase
+plugin_analyzerbase.depends = plugin_coreplugin
+plugin_analyzerbase.depends += plugin_projectexplorer
+plugin_analyzerbase.depends += plugin_remotelinux
+plugin_analyzerbase.depends += plugin_cpptools
+
+plugin_valgrind.subdir = valgrind
+plugin_valgrind.depends = plugin_coreplugin
+plugin_valgrind.depends += plugin_analyzerbase
+plugin_valgrind.depends += plugin_remotelinux
+plugin_valgrind.depends += plugin_texteditor
+
+plugin_qmlprofiler.subdir = qmlprofiler
+plugin_qmlprofiler.depends = plugin_coreplugin
+plugin_qmlprofiler.depends += plugin_analyzerbase
+plugin_qmlprofiler.depends += plugin_qmlprojectmanager
+plugin_qmlprofiler.depends += plugin_qt4projectmanager
+plugin_qmlprofiler.depends += plugin_remotelinux
+plugin_qmlprofiler.depends += plugin_qmljstools
+
+plugin_qmljstools.subdir = qmljstools
+plugin_qmljstools.depends = plugin_projectexplorer
+plugin_qmljstools.depends += plugin_coreplugin
+plugin_qmljstools.depends += plugin_texteditor
+plugin_qmljstools.depends += plugin_qtsupport
+plugin_qmljstools.depends += plugin_cpptools
+
+plugin_macros.subdir = macros
+plugin_macros.depends = plugin_texteditor
+plugin_macros.depends += plugin_find
+plugin_macros.depends += plugin_locator
+plugin_macros.depends += plugin_coreplugin
+
+plugin_todo.subdir = todo
+plugin_todo.depends = plugin_coreplugin
+plugin_todo.depends += plugin_projectexplorer
+plugin_todo.depends += plugin_texteditor
+plugin_todo.depends += plugin_cpptools
+
+plugin_qnx.subdir = qnx
+plugin_qnx.depends = plugin_remotelinux
+plugin_qnx.depends += plugin_qt4projectmanager
+plugin_qnx.depends += plugin_coreplugin
+plugin_qnx.depends += plugin_texteditor
+
+plugin_qbsprojectmanager.subdir = qbsprojectmanager
+plugin_qbsprojectmanager.depends = plugin_texteditor
+plugin_qbsprojectmanager.depends += plugin_projectexplorer
+plugin_qbsprojectmanager.depends += plugin_cpptools
+plugin_qbsprojectmanager.depends += plugin_qmljstools
+plugin_qbsprojectmanager.depends += plugin_qtsupport
+
+plugin_clearcase.subdir = clearcase
+plugin_clearcase.depends = plugin_vcsbase
+plugin_clearcase.depends += plugin_projectexplorer
+plugin_clearcase.depends += plugin_coreplugin
+
+plugin_ubuntu.subdir = ubuntu
+plugin_ubuntu.depends = plugin_coreplugin
+plugin_ubuntu.depends += plugin_projectexplorer
+plugin_ubuntu.depends += plugin_qt4projectmanager
+plugin_ubuntu.depends += plugin_qmlprojectmanager
 
=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntu.pro'
--- qtcreator/src/plugins/ubuntu/ubuntu.pro	2013-02-20 12:33:10 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntu.pro	2013-06-10 18:40:33 +0000
@@ -2,14 +2,14 @@
 TARGET = Ubuntu
 DEFINES += UBUNTU_LIBRARY
 
-QT += network declarative
+QT += network qml quick
 
 PROVIDER = Canonical
-
-include(../../qtcreatorplugin.pri)
-include(../coreplugin/coreplugin.pri)
-include(../projectexplorer/projectexplorer.pri)
-include(../qmlprojectmanager/qmlprojectmanager.pri)
+message($$PWD)
+include($$PWD/../../qtcreatorplugin.pri)
+include($$PWD/../coreplugin/coreplugin.pri)
+include($$PWD/../projectexplorer/projectexplorer.pri)
+include($$PWD/../qmlprojectmanager/qmlprojectmanager.pri)
 
 LIBS += -L$$IDE_PLUGIN_PATH/QtProject
 
 
=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuconstants.h'
--- qtcreator/src/plugins/ubuntu/ubuntuconstants.h	2013-05-04 21:41:03 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuconstants.h	2013-06-10 18:40:33 +0000
@@ -33,6 +33,7 @@
 const char UBUNTU_QMLPROJECT_TYPE[] = "qmlproject";
 const char UBUNTU_QTPROJECT_TYPE[] = "pro";
 const char UBUNTU_QML_TYPE[] = "qml";
+const char UBUNTU_HAS_TESTS[] = "hasTests";
 
 const QString UBUNTU_WELCOMESCREEN_QML = Core::ICore::resourcePath() + QLatin1String("/ubuntu/welcome/welcome.qml");
 const QString UBUNTU_TEMPLATESPATH = Core::ICore::resourcePath() + QLatin1String("/templates/wizards/ubuntu/");
 
=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.cpp'
--- qtcreator/src/plugins/ubuntu/ubuntuplugin.cpp	2013-04-08 13:34:07 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.cpp	2013-06-10 18:40:33 +0000
@@ -26,7 +26,7 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QDebug>
-
+#include <QGuiApplication>
 
 using namespace Ubuntu::Internal;
 
 
=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp'
--- qtcreator/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp	2013-05-03 23:00:15 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp	2013-06-10 18:40:33 +0000
@@ -118,6 +118,13 @@
     if (tmp_type.isUndefined() == false) {
         projectType = tmp_type.toString();
     }
+
+    QJsonValue tmp_hasTests = m_obj.value(QLatin1String(Constants::UBUNTU_HAS_TESTS));
+    bool hasTests = false;
+    if (tmp_hasTests.isUndefined() == false) {
+        hasTests = tmp_hasTests.toBool();
+    }
+
     const UbuntuProjectApplicationWizardDialog *wizard = qobject_cast<const UbuntuProjectApplicationWizardDialog *>(w);
     const QString projectName = wizard->projectName();
     const QString projectPath = wizard->path() + QLatin1Char('/') + projectName;
@@ -187,6 +194,9 @@
                 << "    }" << endl
                 << "    Files {" << endl
                 << "        filter: \"*.desktop\"" << endl
+                << "    }" << endl
+                << "    Files {" << endl
+                << "        filter: \"Makefile\"" << endl
                 << "    }" << endl;
             if (projectType == QLatin1String(Constants::UBUNTU_HTMLPROJECT_TYPE)) {
                 out << "    Files {" << endl
@@ -194,7 +204,7 @@
                     << "        filter: \"*\"" << endl
                     << "    }" << endl;
             }
-            if (projectType == QLatin1String(Constants::UBUNTU_AUTOPILOTPROJECT_TYPE)) {
+            if (hasTests || projectType == QLatin1String(Constants::UBUNTU_AUTOPILOTPROJECT_TYPE)) {
                 out << "    Files {" << endl
                     << "        directory: \"tests/\"" << endl
                     << "        filter: \"*\"" << endl