From: Kai Koehne Date: Mon, 1 Jul 2013 12:10:22 +0000 (+0200) Subject: Debugger: Remove handling of QT_DECLARATIVE_DEBUG macro X-Git-Tag: upstream/5.2.1~677^2~75 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee88f23f430aa266c1cc19e823b1815133df15aa;p=platform%2Fupstream%2Fqtdeclarative.git Debugger: Remove handling of QT_DECLARATIVE_DEBUG macro This was added originally to keep older Qt Creator versions working. However, any newer versions automatically set QT_QML_DEBUG too, and checking for both actively prevented selectively enabling QtQuick1 or QtQuick2 debuggers only. Change-Id: I4d4a984958ef3430ebe05b267bd87185005bbe51 Reviewed-by: Aurindam Jana --- diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index baf4280..d6b6bb0 100644 --- a/src/qml/debugger/qqmldebug.h +++ b/src/qml/debugger/qqmldebug.h @@ -55,7 +55,7 @@ struct Q_QML_EXPORT QQmlDebuggingEnabler // Execute code in constructor before first QQmlEngine is instantiated #if defined(QT_QML_DEBUG_NO_WARNING) static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(false); -#elif defined(QT_QML_DEBUG) || defined(QT_DECLARATIVE_DEBUG) +#elif defined(QT_QML_DEBUG) static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(true); #endif