From e1583664fd8a9eb66e37bdd2e1476bbf90383a4c Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 25 Apr 2012 08:40:48 +0200 Subject: [PATCH] Debugger: Fix warnings about declarative_debug in autotests declarative_debug is deprecated and will be removed eventually. Change-Id: I1f5a61c91c25e37ff39e9154bcaa3cd74d60e109 Reviewed-by: Aurindam Jana --- tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro | 4 +++- tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro | 4 +++- .../qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro | 4 +++- tests/auto/qml/debugger/qqmlinspector/app/app.pro | 2 +- tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro | 2 +- tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro | 2 +- tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro b/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro index 60355f1..bb20940 100644 --- a/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro +++ b/tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro @@ -10,6 +10,8 @@ SOURCES += tst_qqmldebugclient.cpp \ INCLUDEPATH += ../shared include(../shared/debugutil.pri) -CONFIG += declarative_debug +DEFINES += QT_QML_DEBUG_NO_WARNING + +CONFIG += qml_debug QT += qml-private testlib diff --git a/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro b/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro index bbf05b1..39d9903 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro +++ b/tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro @@ -11,6 +11,8 @@ INCLUDEPATH += ../shared include(../../../shared/util.pri) include(../shared/debugutil.pri) -CONFIG += parallel_test declarative_debug +CONFIG += parallel_test + +DEFINES += QT_QML_DEBUG_NO_WARNING QT += qml-private testlib diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro index 0212d11..c48ddcc 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro @@ -13,6 +13,8 @@ INCLUDEPATH += ../shared include(../../../shared/util.pri) include(../shared/debugutil.pri) -CONFIG += parallel_test declarative_debug +CONFIG += parallel_test + +DEFINES += QT_QML_DEBUG_NO_WARNING QT += core-private qml-private quick-private v8-private testlib diff --git a/tests/auto/qml/debugger/qqmlinspector/app/app.pro b/tests/auto/qml/debugger/qqmlinspector/app/app.pro index ce8bfc6..26831bc 100644 --- a/tests/auto/qml/debugger/qqmlinspector/app/app.pro +++ b/tests/auto/qml/debugger/qqmlinspector/app/app.pro @@ -2,7 +2,7 @@ TARGET = app DESTDIR = $$OUT_PWD QT += qml quick -CONFIG += declarative_debug +CONFIG += qml_debug macx:CONFIG -= app_bundle SOURCES += main.cpp diff --git a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro index 6d47581..f6973ba 100644 --- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro +++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.pro @@ -7,6 +7,6 @@ SOURCES += tst_qqmlinspector.cpp INCLUDEPATH += ../shared include(../shared/debugutil.pri) -CONFIG += parallel_test declarative_debug +CONFIG += parallel_test QT += qml testlib diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro index a83590c..2a665a0 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro +++ b/tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro @@ -10,6 +10,6 @@ include(../shared/debugutil.pri) OTHER_FILES += data/test.qml -CONFIG += parallel_test declarative_debug +CONFIG += parallel_test QT += core qml testlib diff --git a/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro b/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro index 13d39c0..99d3a3e 100644 --- a/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro +++ b/tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro @@ -10,7 +10,7 @@ include(../shared/debugutil.pri) OTHER_FILES += data/test.qml -CONFIG += parallel_test declarative_debug +CONFIG += parallel_test QT += qml testlib -- 2.7.4