S60: Add startup logic for Bluetooth to the project/run configuration

Prepare trk::Launcher to deal with a shared trkdevice.
Add encapsulation for the rfcomm listener process and helper
classes for prompting the user to connect the Bluetooth
device. Add a command line prompt to the trklauncher test.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 64b1ee120c..9ab5d93b3b 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -34,6 +34,8 @@
 #include "profilereader.h"
 #include "s60manager.h"
 #include "s60devices.h"
+#include "s60runconfigbluetoothstarter.h"
+#include "bluetoothlistener_gui.h"
 #include "serialdevicelister.h"
 
 #include <coreplugin/icore.h>
@@ -572,6 +574,21 @@ void S60DeviceRunControlBase::signsisProcessFinished()
     initLauncher(runFileName, m_launcher);
     emit addToOutputWindow(this, tr("Package: %1\nDeploying application to '%2'...").arg(lsFile(copySrc), m_serialPortFriendlyName));
     QString errorMessage;
+    // Prompt the user to start up the Blue tooth connection
+    if (m_communicationType == BlueToothCommunication) {
+        S60RunConfigBluetoothStarter starter(m_launcher->trkDevice());
+        switch (trk::startBluetoothGui(starter, 0, &errorMessage)) {
+        case trk::BluetoothGuiConnected:
+            break;
+        case trk::BluetoothGuiCanceled:
+        case trk::BluetoothGuiError:
+            delete m_launcher;
+            m_launcher = 0;
+            error(this, errorMessage);
+            emit finished();
+            return;
+        };
+    }
     if (!m_launcher->startServer(&errorMessage)) {
         delete m_launcher;
         m_launcher = 0;