diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-07-25 15:19:29 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-07-27 16:03:51 +0000 |
| commit | 40ada6f8c83a0eada12966623a4019062f3f84be (patch) | |
| tree | 95dadcc4a1e33d82dfdce333a5a62379dc24a833 /src/qml/debugger | |
| parent | 40c16d15156604a6fe4ac214b8c08dcf61ef57e7 (diff) | |
QML: Remove QQML_NO_DEBUG_PROTOCOL
There is no sane way to set this.
Change-Id: I5f7b70d1947d469dd01a1454180f01ad0d1c099d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/qqmldebug.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/qml/debugger/qqmldebug.cpp b/src/qml/debugger/qqmldebug.cpp index 9276bd0544..386fb60b3a 100644 --- a/src/qml/debugger/qqmldebug.cpp +++ b/src/qml/debugger/qqmldebug.cpp @@ -47,15 +47,11 @@ QT_BEGIN_NAMESPACE QQmlDebuggingEnabler::QQmlDebuggingEnabler(bool printWarning) { -#ifndef QQML_NO_DEBUG_PROTOCOL if (!QQmlEnginePrivate::qml_debugging_enabled && printWarning) { qDebug("QML debugging is enabled. Only use this in a safe environment."); } QQmlEnginePrivate::qml_debugging_enabled = true; -#else - Q_UNUSED(printWarning); -#endif } /*! @@ -105,11 +101,7 @@ QStringList QQmlDebuggingEnabler::profilerServices() */ void QQmlDebuggingEnabler::setServices(const QStringList &services) { -#ifndef QQML_NO_DEBUG_PROTOCOL QQmlDebugConnector::setServices(services); -#else - Q_UNUSED(services); -#endif } /*! @@ -172,16 +164,9 @@ bool QQmlDebuggingEnabler::connectToLocalDebugger(const QString &socketFileName, bool QQmlDebuggingEnabler::startDebugConnector(const QString &pluginName, const QVariantHash &configuration) { -#ifndef QQML_NO_DEBUG_PROTOCOL QQmlDebugConnector::setPluginKey(pluginName); QQmlDebugConnector *connector = QQmlDebugConnector::instance(); - if (connector) - return connector->open(configuration); -#else - Q_UNUSED(pluginName); - Q_UNUSED(configuration); -#endif - return false; + return connector ? connector->open(configuration) : false; } QT_END_NAMESPACE |