diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-18 13:45:47 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-26 08:22:44 +0000 |
| commit | 77fa80f1edbcfa81e6364b1b7d410854ce036447 (patch) | |
| tree | 71593851573b52a2221a35dc7f9603784dd8266a /src/qml/debugger/qqmldebugserver.cpp | |
| parent | b245bd90e52caba41d55a5a9d12e75ef0a927b0a (diff) | |
Disable plugin loading in QQmlDebugServer if QT_NO_LIBRARY
Change-Id: I29682fc069cb457abeca90a1e1f7f7c964ed1607
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugserver.cpp')
| -rw-r--r-- | src/qml/debugger/qqmldebugserver.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp index a9086ee5d6..9985efcf12 100644 --- a/src/qml/debugger/qqmldebugserver.cpp +++ b/src/qml/debugger/qqmldebugserver.cpp @@ -51,7 +51,7 @@ #include <private/qobject_p.h> #include <private/qcoreapplication_p.h> -#if defined(QT_STATIC) && ! defined(QT_NO_QML_DEBUGGER) +#if defined(QT_STATIC) && !defined(QT_NO_QML_DEBUGGER) && !defined(QT_NO_LIBRARY) #include "../../plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h" #endif @@ -94,7 +94,9 @@ const int protocolVersion = 1; int QQmlDebugServer::s_dataStreamVersion = QDataStream::Qt_4_7; // print detailed information about loading of plugins +#ifndef QT_NO_LIBRARY DEFINE_BOOL_CONFIG_OPTION(qmlDebugVerbose, QML_DEBUGGER_VERBOSE) +#endif class QQmlDebugServerThread; @@ -136,7 +138,9 @@ public: QMutex helloMutex; QWaitCondition helloCondition; QQmlDebugServerThread *thread; +#ifndef QT_NO_LIBRARY QPluginLoader loader; +#endif QAtomicInt changeServiceStateCalls; private: @@ -286,6 +290,8 @@ QQmlDebugServerConnection *QQmlDebugServerPrivate::loadConnectionPlugin( loader.unload(); } +#else + Q_UNUSED(pluginName); #endif return 0; } @@ -295,7 +301,7 @@ void QQmlDebugServerThread::run() QQmlDebugServerInstanceWrapper *wrapper = debugServerInstance(); Q_ASSERT_X(wrapper != 0, Q_FUNC_INFO, "There should always be a debug server available here."); QQmlDebugServer *server = &wrapper->m_instance; -#if defined(QT_STATIC) && ! defined(QT_NO_QML_DEBUGGER) +#if defined(QT_STATIC) && !defined(QT_NO_QML_DEBUGGER) && !defined(QT_NO_LIBRARY) QQmlDebugServerConnection *connection = new QTcpServerConnection; #else |