diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-14 18:37:44 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-04 13:34:43 +0000 |
| commit | 31291359a327c5ffa6aa3aff76b62491782408d7 (patch) | |
| tree | 9c2382e8a466dd5ffba5b6359979da7a6467e3c8 /src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp | |
| parent | f0fdb1ce982c6cf594379c92fd45d745805d4b4c (diff) | |
Remove QT_NO_QML_DEBUGGER ifdefs from QQmlDebugServer
Plugins in qmltooling won't get built if that is set.
Change-Id: Ideced675064e74ccb78b9ac8c8fff2536150810c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp index 83724f2607..af77e6875b 100644 --- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp +++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp @@ -48,7 +48,7 @@ #include <private/qobject_p.h> #include <private/qcoreapplication_p.h> -#if defined(QT_STATIC) && !defined(QT_NO_QML_DEBUGGER) && !defined(QT_NO_LIBRARY) +#if defined(QT_STATIC) && !defined(QT_NO_LIBRARY) #include "../../plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h" #endif @@ -309,7 +309,7 @@ QQmlDebugServerConnection *QQmlDebugServerImpl::loadConnectionPlugin(const QStri void QQmlDebugServerThread::run() { Q_ASSERT_X(m_server != 0, Q_FUNC_INFO, "There should always be a debug server available here."); -#if defined(QT_STATIC) && !defined(QT_NO_QML_DEBUGGER) && !defined(QT_NO_LIBRARY) +#if defined(QT_STATIC) && !defined(QT_NO_LIBRARY) QQmlDebugServerConnection *connection = new QTcpServerConnection; #else @@ -420,7 +420,6 @@ bool QQmlDebugServerImpl::enableFromArguments() { // format: qmljsdebugger=port:<port_from>[,port_to],host:<ip address>][,block] const QString args = commandLineArguments(); -#ifndef QT_NO_QML_DEBUGGER if (args.isEmpty()) return false; // Manual initialization, through QQmlDebugServer::open() @@ -476,13 +475,6 @@ bool QQmlDebugServerImpl::enableFromArguments() "Format is qmljsdebugger=port:<port_from>[,port_to],host:" "<ip address>][,block]").arg(args); } -#else - if (!args.isEmpty()) { - qWarning() << QString(QLatin1String( - "QML Debugger: Ignoring \"-qmljsdebugger=%1\". " - "QtQml is not configured for debugging.")).arg(args); - } -#endif return false; } @@ -742,7 +734,6 @@ void QQmlDebugServerImpl::sendMessages(const QString &name, const QList<QByteArr template<class Action> bool QQmlDebugServerImpl::enable(Action action) { -#ifndef QT_NO_QML_DEBUGGER if (m_thread) return false; if (!action(this)) @@ -753,10 +744,6 @@ bool QQmlDebugServerImpl::enable(Action action) if (m_blockingMode && !m_gotHello) m_helloCondition.wait(&m_helloMutex); // wait for hello return true; -#else - Q_UNUSED(action); - return false; -#endif } void QQmlDebugServerImpl::wakeEngine(QQmlEngine *engine) |