diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-03-30 13:49:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-30 15:51:16 +0200 |
| commit | 4eb94ba3fc50a3a997a9fbda649539d2996329ca (patch) | |
| tree | 8dce4e6e1328267a427d83fb40fa5840f531c163 | |
| parent | 1e8dc1636ce6ed53ab6d3b0dde55a27ef4a3cae0 (diff) | |
Debugger: Use "QML" also in macro names
QT_DECLARATIVE_DEBUG will be removed as soon as qtbase is
updated.
Change-Id: I9dbfe95b8bcb3bf1502319a040a758389b6977a2
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
| -rw-r--r-- | src/qml/debugger/qqmldebug.h | 4 | ||||
| -rw-r--r-- | src/qml/debugger/qqmldebugserver.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlscene/qmlscene.pro | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index 318e0bd71f..115f3cbc3a 100644 --- a/src/qml/debugger/qqmldebug.h +++ b/src/qml/debugger/qqmldebug.h @@ -55,9 +55,9 @@ struct Q_QML_EXPORT QQmlDebuggingEnabler }; // Execute code in constructor before first QQmlEngine is instantiated -#if defined(QT_DECLARATIVE_DEBUG_NO_WARNING) +#if defined(QT_QML_DEBUG_NO_WARNING) static QQmlDebuggingEnabler qmlEnableDebuggingHelper(false); -#elif defined(QT_DECLARATIVE_DEBUG) +#elif defined(QT_QML_DEBUG) || defined(QT_DECLARATIVE_DEBUG) static QQmlDebuggingEnabler qmlEnableDebuggingHelper(true); #endif diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp index 2b2c81a10f..4e4a86db33 100644 --- a/src/qml/debugger/qqmldebugserver.cpp +++ b/src/qml/debugger/qqmldebugserver.cpp @@ -255,7 +255,7 @@ QQmlDebugServer *QQmlDebugServer::instance() commandLineTested = true; QCoreApplicationPrivate *appD = static_cast<QCoreApplicationPrivate*>(QObjectPrivate::get(qApp)); -#ifndef QQML_NO_DEBUG_PROTOCOL +#ifndef QT_QML_NO_DEBUGGER // ### remove port definition when protocol is changed int port = 0; bool block = false; diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index 3e63bd7659..464f9b3758 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -14,4 +14,4 @@ SOURCES += main.cpp CONFIG += console -DEFINES += QML_RUNTIME_TESTING QT_DECLARATIVE_DEBUG_NO_WARNING +DEFINES += QML_RUNTIME_TESTING QT_QML_DEBUG_NO_WARNING |