diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
| commit | 3a6f5735ee723ff998114314c5ccdf6609667f6f (patch) | |
| tree | 9c877dd1e35972fa336cea8a61986594f168b49c /src/qml/debugger | |
| parent | 000b6330d4ca7165ff241b21ee728ed28d82fba1 (diff) | |
| parent | 17ded06804576dfde1b19f82f168f7ceb09ec92c (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4
Conflicts:
src/quick/items/context2d/qquickcontext2d.cpp
tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
Change-Id: I36a4fd28b3156839aecd70039a3ba566bf19a0bc
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/qqmldebug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index d2b0220bc6..d6b6bb0301 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); -#elif defined(QT_QML_DEBUG) || defined(QT_DECLARATIVE_DEBUG) -static QQmlDebuggingEnabler qmlEnableDebuggingHelper(true); +static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(false); +#elif defined(QT_QML_DEBUG) +static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(true); #endif QT_END_NAMESPACE |