From ecb758910f20fc4ca3269c8c6de6c322844268a4 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 1 Jul 2013 14:07:23 +0200 Subject: [PATCH] Disambiguate name of static helper from QtQuick1 Change name of static 'qmlEnableDebuggingHelper' variable to disambiguate it from QtQuick1 variable with the same name. Task-number: QTBUG-31064 Change-Id: Ia4b0f18a33a383dd4ade1bdb45506304f9066502 Reviewed-by: Aurindam Jana --- src/qml/debugger/qqmldebug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index d2b0220..baf4280 100644 --- a/src/qml/debugger/qqmldebug.h +++ b/src/qml/debugger/qqmldebug.h @@ -54,9 +54,9 @@ struct Q_QML_EXPORT QQmlDebuggingEnabler // Execute code in constructor before first QQmlEngine is instantiated #if defined(QT_QML_DEBUG_NO_WARNING) -static QQmlDebuggingEnabler qmlEnableDebuggingHelper(false); +static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(false); #elif defined(QT_QML_DEBUG) || defined(QT_DECLARATIVE_DEBUG) -static QQmlDebuggingEnabler qmlEnableDebuggingHelper(true); +static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(true); #endif QT_END_NAMESPACE -- 2.7.4