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

[Benjamin Zeller]

- Make scopes run again
- Fix Bug lp:1427133 "Build and validate click package button disabled
without explanation"

- Make scopes run again
- Fix Bug lp:1427133 "Build and validate click package button disabled
without explanation"

[Zoltan Balogh (bzoltan)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:426
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/578/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/39

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

review: Approve (continuous-integration)

=== modified file 'share/qtcreator/ubuntu/qml/publishpage.qml'
--- share/qtcreator/ubuntu/qml/publishpage.qml	2015-11-23 10:34:50 +0000
+++ share/qtcreator/ubuntu/qml/publishpage.qml	2015-11-27 13:26:12 +0000
@@ -104,11 +104,26 @@
             }
         }
 
+        Row {
+            id: warningsRow
+            anchors.top: topRow.bottom
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.topMargin: units.gu(2)
+            spacing: units.gu(2)
+            visible: !publishModel.canBuild
+            Icon {
+                source: "qrc:/ubuntu/images/warning.png"
+            }
+            Label {
+                text: "The selected Kit does not support building click packages. Please make sure to select a Ubuntu Kit."
+            }
+        }
+
         ScrollableView {
             id: scrollView
             clip: true
 
-            anchors.top: topRow.bottom
+            anchors.top: warningsRow.bottom
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: parent.bottom

=== modified file 'src/ubuntu/ubuntupackagestep.cpp'
--- src/ubuntu/ubuntupackagestep.cpp	2015-09-09 11:45:25 +0000
+++ src/ubuntu/ubuntupackagestep.cpp	2015-11-27 13:26:12 +0000
@@ -628,7 +628,7 @@
                     continue;
                 }
 
-                QString defaultSubCmd = QStringLiteral("/usr/lib/%1/unity-scopes/scoperunner '' %S ").arg(static_cast<ClickToolChain*>(tc)->gnutriplet());
+                QString defaultSubCmd = QStringLiteral("/usr/lib/%1/unity-scopes/scoperunner %R %S ").arg(static_cast<ClickToolChain*>(tc)->gnutriplet());
                 QString commTemplate = QStringLiteral("./%S scope %1 %C")
                         .arg(manifest.name()+QStringLiteral("_")+hook.appId); //tell our script the appid