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

[Benjamin Zeller]

Start click-chroot-agent from the install path when packaged as ubuntu-
sdk-ide

Start click-chroot-agent from the install path when packaged as ubuntu-
sdk-ide

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

417. By Benjamin Zeller on 2015-10-14

remove unused commit

[Zoltan Balogh (bzoltan)]

Cool

review: Approve

=== modified file 'src/ubuntu/ubuntuplugin.cpp'
--- src/ubuntu/ubuntuplugin.cpp	2015-09-03 09:20:52 +0000
+++ src/ubuntu/ubuntuplugin.cpp	2015-10-14 09:24:19 +0000
@@ -84,22 +84,28 @@
 UbuntuPlugin::UbuntuPlugin()
 {
     if(UbuntuClickTool::clickChrootSuffix() == QLatin1String(Constants::UBUNTU_CLICK_CHROOT_DEFAULT_NAME)) {
+
+        bool started = false;
 #ifdef UBUNTU_BUILD_ROOT
         Utils::FileName chrootAgent = Utils::FileName::fromString(QStringLiteral(UBUNTU_BUILD_ROOT));
         chrootAgent.appendPath(QStringLiteral("chroot-agent"))  //append dir
                 .appendPath(QStringLiteral("click-chroot-agent")); //append binary
 
-        bool started = false;
         if(chrootAgent.toFileInfo().isExecutable()) {
             started = QProcess::startDetached(chrootAgent.toFileInfo().absoluteFilePath());
         }
+#endif
         if(!started) {
-            QProcess::startDetached(QStringLiteral("click-chroot-agent"));
+            Utils::FileName agent = Utils::FileName::fromString(QCoreApplication::applicationDirPath())
+                    .appendPath(QStringLiteral("click-chroot-agent"));
+
+            if (agent.toFileInfo().isExecutable()) {
+                QProcess::startDetached(agent.toString());
+            } else {
+                //start the chroot-agent
+                QProcess::startDetached(QStringLiteral("click-chroot-agent"));
+            }
         }
-#else
-        //start the chroot-agent
-        QProcess::startDetached(QStringLiteral("click-chroot-agent"));
-#endif
     }
 }