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

[Benjamin Zeller]

- Fix crash when there are no devices in the settings
- Fix possible crash when a kit has not toolchain set
- Disable debug output

- Fix crash when there are no devices in the settings
- Fix possible crash when a kit has not toolchain set
- Disable debug output

[Zoltan Balogh (bzoltan)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/ubuntu/ubuntudevicesmodel.cpp'
--- src/ubuntu/ubuntudevicesmodel.cpp	2015-08-10 16:15:25 +0000
+++ src/ubuntu/ubuntudevicesmodel.cpp	2015-11-11 14:53:39 +0000
@@ -451,9 +451,11 @@
         }
     }
 
-    beginInsertRows(QModelIndex(),0,devs.count()-1);
-    m_knownDevices = devs;
-    endInsertRows();
+    if (devs.count()) {
+        beginInsertRows(QModelIndex(),0,devs.count()-1);
+        m_knownDevices = devs;
+        endInsertRows();
+    }
 
     connect(devMgr,SIGNAL(deviceAdded(Core::Id)),this,SLOT(deviceAdded(Core::Id)),Qt::UniqueConnection);
     connect(devMgr,SIGNAL(deviceRemoved(Core::Id)),this,SLOT(deviceRemoved(Core::Id)),Qt::UniqueConnection);

=== modified file 'src/ubuntu/ubuntulocalrunconfiguration.cpp'
--- src/ubuntu/ubuntulocalrunconfiguration.cpp	2015-06-30 13:34:14 +0000
+++ src/ubuntu/ubuntulocalrunconfiguration.cpp	2015-11-11 14:53:39 +0000
@@ -41,7 +41,7 @@
 using namespace Ubuntu::Internal;
 
 enum {
-    debug = 1
+    debug = 0
 };
 
 UbuntuLocalEnvironmentAspect::UbuntuLocalEnvironmentAspect(ProjectExplorer::RunConfiguration *parent)

=== modified file 'src/ubuntu/wizards/ubuntufirstrunwizard.cpp'
--- src/ubuntu/wizards/ubuntufirstrunwizard.cpp	2015-06-10 11:54:29 +0000
+++ src/ubuntu/wizards/ubuntufirstrunwizard.cpp	2015-11-11 14:53:39 +0000
@@ -11,6 +11,7 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <qtsupport/qtkitinformation.h>
 
 #include <QLabel>
 #include <QPushButton>
@@ -132,6 +133,10 @@
         ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(curr);
         const Core::Id devId = ProjectExplorer::DeviceKitInformation::deviceId(curr);
 
+        //we just care about Kits with a toolchain and a qt version
+        if (!tc || !QtSupport::QtKitInformation::qtVersion(curr))
+            continue;
+
         if (tc->type() == QLatin1String(Constants::UBUNTU_CLICK_TOOLCHAIN_ID) ||
                 devId == ProjectExplorer::Constants::DESKTOP_DEVICE_ID) {
             found = true;