Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/small-templ-fix into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

- Make use of the backend in the qmake+backend app template
- Fix passing of the "CLICK_NO_LOCAL_MIRROR" env var to the chroot creation script

Make use of the backend in the qmake+backend app template

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/small-templ-fix]

350. By Benjamin Zeller on 2015-02-09

Fix passing of the CLICK_NO_LOCAL_MIRROR env var

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/512/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/46

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:350
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/513/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/47

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml	2015-01-17 04:53:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/Main.qml	2015-02-09 11:47:58 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.1
-
+import %ClickHookName:s% 1.0
 /*!
     \brief MainView with a Label and Button elements.
 */
@@ -25,7 +25,15 @@
     height: units.gu(75)
 
     Page {
-        title: i18n.tr("Simple")
+        title: i18n.tr("App with backend")
+
+        MyType {
+            id: myType
+
+            Component.onCompleted: {
+                myType.helloWorld = i18n.tr("Hello world..")
+            }
+        }
 
         Column {
             spacing: units.gu(1)
@@ -38,7 +46,7 @@
                 id: label
                 objectName: "label"
 
-                text: i18n.tr("Hello..")
+                text: myType.helloWorld
             }
 
             Button {
@@ -48,7 +56,7 @@
                 text: i18n.tr("Tap me!")
 
                 onClicked: {
-                    label.text = i18n.tr("..world!")
+                    myType.helloWorld = i18n.tr("..from Cpp Backend")
                 }
             }
         }

=== modified file 'src/ubuntu/ubuntuclicktool.cpp'
--- src/ubuntu/ubuntuclicktool.cpp	2015-02-05 08:28:21 +0000
+++ src/ubuntu/ubuntuclicktool.cpp	2015-02-09 11:47:58 +0000
@@ -112,12 +112,11 @@
     bool useLocalMirror = settings.value(QLatin1String(Constants::SETTINGS_KEY_CHROOT_USE_LOCAL_MIRROR),false).toBool();
     settings.endGroup();
 
-    Utils::Environment env = Utils::Environment::systemEnvironment();
     if(!useLocalMirror)
-        env.set(QStringLiteral("CLICK_NO_LOCAL_MIRROR"),QStringLiteral("1"));
+        command.prepend(QStringLiteral("env CLICK_NO_LOCAL_MIRROR=1 "));
 
     params->setCommand(QLatin1String(Constants::UBUNTU_SUDO_BINARY));
-    params->setEnvironment(env);
+    params->setEnvironment(Utils::Environment::systemEnvironment());
     params->setArguments(command);
 }
 

=== modified file 'src/ubuntu/ubuntusettingsclickwidget.cpp'
--- src/ubuntu/ubuntusettingsclickwidget.cpp	2015-02-05 08:28:21 +0000
+++ src/ubuntu/ubuntusettingsclickwidget.cpp	2015-02-09 11:47:58 +0000
@@ -75,8 +75,11 @@
 
 void UbuntuSettingsClickWidget::on_pushButtonCreateClickTarget_clicked()
 {
-   QString dummy;
-   Internal::UbuntuClickDialog::createClickChrootModal(true, dummy, this);
+    //make sure the current settings are stored
+    apply();
+
+    QString dummy;
+    Internal::UbuntuClickDialog::createClickChrootModal(true, dummy, this);
     listExistingClickTargets();
 }