Disambiguate name of static helper from QtQuick1
authorKai Koehne <kai.koehne@digia.com>
Mon, 1 Jul 2013 12:07:23 +0000 (14:07 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 2 Jul 2013 12:59:48 +0000 (14:59 +0200)
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 <aurindam.jana@digia.com>
src/qml/debugger/qqmldebug.h

index d2b0220..baf4280 100644 (file)
@@ -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