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

[Benjamin Zeller]

Show Desktop Kit in chroot setup page ( lp:1366934 lp:1369828)
Fix Bug lp:1400842 "devices panel: text says refresh but button is redetect"

Show Desktop Kit in chroot setup page ( lp:1366934 lp:1369828)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix2]

382. By Benjamin Zeller on 2015-05-04

Fix Bug lp:1400842 "devices panel: text says refresh but button is
redetect"

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:382
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/535/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/69

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

review: Approve (continuous-integration)

=== modified file 'share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml'
--- share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml	2015-04-10 15:06:01 +0000
+++ share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml	2015-05-04 12:31:18 +0000
@@ -307,7 +307,7 @@
                                 }
                                 Button {
                                     id: deviceRedetectButton
-                                    text: "Redetect"
+                                    text: "Refresh"
                                     onClicked: devicesModel.triggerRedetect(deviceId)
                                 }
                             }
@@ -332,7 +332,7 @@
                                     Layout.fillWidth: true
                                 }
                                 Button {
-                                    text: "Redetect"
+                                    text: "Refresh"
                                     onClicked: devicesModel.triggerRedetect(deviceId)
                                 }
                             }

=== modified file 'src/ubuntu/wizards/ubuntufirstrunwizard.cpp'
--- src/ubuntu/wizards/ubuntufirstrunwizard.cpp	2015-05-04 12:31:18 +0000
+++ src/ubuntu/wizards/ubuntufirstrunwizard.cpp	2015-05-04 12:31:18 +0000
@@ -10,6 +10,7 @@
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
 
 #include <QLabel>
 #include <QPushButton>
@@ -129,7 +130,10 @@
     bool found = false;
     foreach(ProjectExplorer::Kit *curr, allKits) {
         ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(curr);
-        if (tc->type() == QLatin1String(Constants::UBUNTU_CLICK_TOOLCHAIN_ID)) {
+        const Core::Id devId = ProjectExplorer::DeviceKitInformation::deviceId(curr);
+
+        if (tc->type() == QLatin1String(Constants::UBUNTU_CLICK_TOOLCHAIN_ID) ||
+                devId == ProjectExplorer::Constants::DESKTOP_DEVICE_ID) {
             found = true;
 
             QTreeWidgetItem* kitItem = new QTreeWidgetItem;