Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/moresimple into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

- Make the simple template, really simple
- make sure autopilot tests work again

Make the simple template, really simple and make sure autopilot tests work again

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:269
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/423/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/191

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/423/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/simple/components'
=== removed file 'share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml'
--- share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml	2014-08-21 10:23:21 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-UbuntuShape {
-    width: 200
-    height: width
-
-    property alias text : myText.text
-
-    Label {
-        id: myText
-        anchors.centerIn: parent
-    }
-}

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple/main.qml'
--- share/qtcreator/templates/wizards/ubuntu/simple/main.qml	2014-09-03 11:49:49 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple/main.qml	2014-09-15 15:44:35 +0000
@@ -1,6 +1,5 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.1
-import "components"
 
 /*!
     \brief MainView with a Label and Button elements.
@@ -35,7 +34,7 @@
                 fill: parent
             }
 
-            HelloComponent {
+            Label {
                 id: label
                 objectName: "label"
 

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/__init__.py	2014-06-30 15:20:18 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/__init__.py	2014-09-15 15:44:35 +0000
@@ -55,7 +55,7 @@
                 "only run from source.")
 
     def _get_app_qml_source_path(self):
-        qml_file_name = '{0}.qml'.format(self.app_name)
+        qml_file_name = 'main.qml'
         return os.path.join(self._get_path_to_app_source(), qml_file_name)
 
     def _get_path_to_app_source(self):

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simple/wizard.xml	2014-09-12 08:39:29 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple/wizard.xml	2014-09-15 15:44:35 +0000
@@ -14,7 +14,6 @@
     <files>
 			<file source="../share/manifest.json"   						target="manifest.json" openeditor="true"/>
 	         	<file source="../share/displayName.qmlproject" 				target="%ProjectName%.qmlproject" openproject="true"/>
-			<file source="components/HelloComponent.qml"  target="components/HelloComponent.qml" openeditor="false"/>
 			<file source="main.qml"   										target="main.qml" openeditor="true"/>
 			<file source="displayName.png"   							target="%ProjectName%.png" openeditor="false" binary="true"/>
 			<file source="displayName.desktop"   					target="%ClickHookName%.desktop" openeditor="false"/>