From: Kai Koehne Date: Fri, 30 Mar 2012 11:49:33 +0000 (+0200) Subject: Debugger: Use "QML" also in macro names X-Git-Tag: upstream/5.2.1~2188 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4eb94ba3fc50a3a997a9fbda649539d2996329ca;p=platform%2Fupstream%2Fqtdeclarative.git 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 --- diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index 318e0bd..115f3cb 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 2b2c81a..4e4a86d 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(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 3e63bd7..464f9b3 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