aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ios/iosrunner.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2015-08-10 17:43:58 +0200
committerUlf Hermann <ulf.hermann@theqtcompany.com>2015-08-17 15:13:56 +0000
commit5f90990c308e2deddc3f9491262e354477ebe5f4 (patch)
tree65f7524332bc61168836ebf16fd5d84dc4deb083 /src/plugins/ios/iosrunner.h
parentbe31022276ced789d3a0ea2fb373a63a5921e157 (diff)
Tell the QML debug server exactly what services we expect
The services need to be loaded before the first QML engine is created. The first QML engine may be created before a client connects. When the JavaScript debug service is loaded the engine is put into interpreter mode as we don't support debugging in JIT mode. Profiling, however should be done in JIT mode, whenever possible. Thus, in order to avoid the loading of unnecessary plugins and to get better results from the QML profiler we tell the debug server which services we expect, even before the client connects. Qt 5.6 will support additional command line arguments to specify the services and this change uses them. Change-Id: I6dcee016c39995e9adada6eaf0e39d8299c9b7e7 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/ios/iosrunner.h')
-rw-r--r--src/plugins/ios/iosrunner.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/ios/iosrunner.h b/src/plugins/ios/iosrunner.h
index 22946e4cdc5..569f42f8678 100644
--- a/src/plugins/ios/iosrunner.h
+++ b/src/plugins/ios/iosrunner.h
@@ -35,6 +35,7 @@
#include "iossimulator.h"
#include <projectexplorer/devicesupport/idevice.h>
+#include <qmldebug/qmldebugcommandlinearguments.h>
#include <QObject>
#include <QTimer>
@@ -52,7 +53,8 @@ class IosRunner : public QObject
Q_OBJECT
public:
- IosRunner(QObject *parent, IosRunConfiguration *runConfig, bool cppDebug, bool qmlDebug);
+ IosRunner(QObject *parent, IosRunConfiguration *runConfig, bool cppDebug,
+ QmlDebug::QmlDebugServicesPreset qmlDebugServices);
~IosRunner();
QString displayName() const;
@@ -62,7 +64,7 @@ public:
QString deviceId();
IosToolHandler::RunKind runType();
bool cppDebug() const;
- bool qmlDebug() const;
+ QmlDebug::QmlDebugServicesPreset qmlDebugServices() const;
public slots:
void start();
void stop();
@@ -92,7 +94,8 @@ private:
ProjectExplorer::IDevice::ConstPtr m_device;
IosDeviceType m_deviceType;
bool m_cppDebug;
- bool m_qmlDebug;
+ QmlDebug::QmlDebugServicesPreset m_qmlDebugServices;
+
bool m_cleanExit;
quint16 m_qmlPort;
Q_PID m_pid;