diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2014-12-17 12:00:41 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-12 19:19:46 +0100 |
| commit | c5b575bdc26b54e4807760c9731e9b9752f56f21 (patch) | |
| tree | 7c106d39681b3a9481e641b9f7befd01247e1cea /src/qml/debugger/qqmldebugserver.cpp | |
| parent | 327af26d8d5421983a10693bb9039de31a5788be (diff) | |
Rename QML debug macro to Qt naming style
With this change the macro is in line with QT_NO_<feature> style
of naming macros. This way it will also be automatically added to
the file mkspecs/qmodule.pri in QT_NO_DEFINES value.
Change-Id: I96041438ef68bbcbc4e66301b0f5fe1212129c1a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugserver.cpp')
| -rw-r--r-- | src/qml/debugger/qqmldebugserver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp index e85929ac77..cbed6151bf 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_QML_NO_DEBUGGER) +#if defined(QT_STATIC) && ! defined(QT_NO_QML_DEBUGGER) #include "../../plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h" #endif @@ -291,7 +291,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_QML_NO_DEBUGGER) +#if defined(QT_STATIC) && ! defined(QT_NO_QML_DEBUGGER) QQmlDebugServerConnection *connection = new QTcpServerConnection; #else @@ -401,7 +401,7 @@ QQmlDebugServer::QQmlDebugServer() if (qApp == 0) return; QCoreApplicationPrivate *appD = static_cast<QCoreApplicationPrivate*>(QObjectPrivate::get(qApp)); -#ifndef QT_QML_NO_DEBUGGER +#ifndef QT_NO_QML_DEBUGGER // ### remove port definition when protocol is changed int portFrom = 0; int portTo = 0; @@ -732,7 +732,7 @@ void QQmlDebugServer::sendMessages(QQmlDebugService *service, bool QQmlDebugServer::enable(int portFrom, int portTo, bool block, const QString &hostAddress) { -#ifndef QT_QML_NO_DEBUGGER +#ifndef QT_NO_QML_DEBUGGER QQmlDebugServerInstanceWrapper *wrapper = debugServerInstance(); if (!wrapper) return false; |