Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/js-scopes-support into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

- Fix Bug lp:1537550 "Manifest changes are not saved before publishing
regardless of setting"
- Fix Bug lp:1534509 "Please attach your device - which one?"
- Add support for executing custom scope runners on the phone

- Fix Bug lp:1537550 "Manifest changes are not saved before publishing
regardless of setting"
- Fix Bug lp:1534509 "Please attach your device - which one?"
- Add support for executing custom scope runners on the phone

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/js-scopes-support]

441. By Benjamin Zeller on 2016-02-09

Add bug

442. By Benjamin Zeller on 2016-02-09

Remove debug output

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:442
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/20/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/694/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/20/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'src/ubuntu/ubuntupackagingmodel.cpp'
--- src/ubuntu/ubuntupackagingmodel.cpp	2015-09-01 11:47:03 +0000
+++ src/ubuntu/ubuntupackagingmodel.cpp	2016-02-09 12:10:57 +0000
@@ -427,6 +427,9 @@
         return;
     }
 
+    if(!ProjectExplorer::ProjectExplorerPlugin::instance()->saveModifiedFiles())
+        return;
+
     QString mimeType = project->projectManager()->mimeType();
     bool isCMake = mimeType == QLatin1String(CMakeProjectManager::Constants::CMAKEPROJECTMIMETYPE);
     bool isHtml  = mimeType == QLatin1String(Ubuntu::Constants::UBUNTUPROJECT_MIMETYPE);

=== modified file 'src/ubuntu/ubunturemoterunconfiguration.cpp'
--- src/ubuntu/ubunturemoterunconfiguration.cpp	2015-09-09 10:01:09 +0000
+++ src/ubuntu/ubunturemoterunconfiguration.cpp	2016-02-09 12:10:57 +0000
@@ -390,9 +390,10 @@
             m_arguments = args;
             return true;
         } else {
-            if(errorMessage)
-                *errorMessage = tr("Using a custom scopelauncher is not yet supported");
-            return false;
+            //no debug support for custom scoperunners
+            m_localExecutable = QString();
+            m_remoteExecutable = executable;
+            return true;
         }
     }
 

=== modified file 'src/ubuntu/ubunturemoteruncontrolfactory.cpp'
--- src/ubuntu/ubunturemoteruncontrolfactory.cpp	2015-07-14 13:18:00 +0000
+++ src/ubuntu/ubunturemoteruncontrolfactory.cpp	2016-02-09 12:10:57 +0000
@@ -89,6 +89,11 @@
 
             if(debug) qDebug()<<"Free ports on the device: "<<dev->freePorts().count();
 
+            if (rc->localExecutableFilePath().isEmpty()) {
+                if (errorMessage) *errorMessage = tr("The current project has no support for running in a debugger.");
+                return 0;
+            }
+
             if (2 > dev->freePorts().count()) {
                 *errorMessage = tr("Cannot debug: Not enough free ports available.");
                 return 0;

=== modified file 'src/ubuntu/ubuntuwaitfordevicedialog.cpp'
--- src/ubuntu/ubuntuwaitfordevicedialog.cpp	2014-08-06 11:47:54 +0000
+++ src/ubuntu/ubuntuwaitfordevicedialog.cpp	2016-02-09 12:10:57 +0000
@@ -54,7 +54,8 @@
     switch (m_dev->deviceState()) {
         case ProjectExplorer::IDevice::DeviceDisconnected:
         case ProjectExplorer::IDevice::DeviceStateUnknown:
-            setLabelText(isEmulator ? tr("Please start your emulator") : tr("Please attach your device"));
+            setLabelText(isEmulator ? tr("Please start your emulator: %1").arg(m_dev->displayName())
+                                    : tr("Please attach your device: %1").arg(m_dev->displayName()));
             break;
         case ProjectExplorer::IDevice::DeviceConnected:
             setLabelText(tr("Waiting for your %1 to get ready").arg(isEmulator ? tr("emulator") : tr("device")));