From f3fa41d4a98f49be8991f615d6d720779a2b5850 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 1 Aug 2012 15:46:05 +0200 Subject: Set the Qt API level to compatibility mode in all tests. Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I535233146a2f6d5c8966442dce8a6f088027e493 Reviewed-by: Lars Knoll --- .../qdeclarativedocumentgalleryitem/qdeclarativedocumentgalleryitem.pro | 1 + .../qdeclarativedocumentgallerymodel.pro | 1 + .../qdeclarativedocumentgallerytype/qdeclarativedocumentgallerytype.pro | 1 + tests/auto/qdocumentgallery/qdocumentgallery.pro | 1 + tests/auto/qgalleryabstractrequest/qgalleryabstractrequest.pro | 1 + tests/auto/qgalleryabstractresponse/qgalleryabstractresponse.pro | 1 + tests/auto/qgalleryfilter/qgalleryfilter.pro | 1 + tests/auto/qgalleryitemrequest/qgalleryitemrequest.pro | 1 + tests/auto/qgalleryquerymodel/qgalleryquerymodel.pro | 1 + tests/auto/qgalleryqueryrequest/qgalleryqueryrequest.pro | 1 + tests/auto/qgalleryresource/qgalleryresource.pro | 1 + .../qgallerytrackerresultset_tracker.pro | 1 + .../auto/qgallerytrackerschema_tracker/qgallerytrackerschema_tracker.pro | 1 + tests/auto/qgallerytyperequest/qgallerytyperequest.pro | 1 + 14 files changed, 14 insertions(+) (limited to 'tests') diff --git a/tests/auto/qdeclarativedocumentgalleryitem/qdeclarativedocumentgalleryitem.pro b/tests/auto/qdeclarativedocumentgalleryitem/qdeclarativedocumentgalleryitem.pro index d558591..876e9f6 100644 --- a/tests/auto/qdeclarativedocumentgalleryitem/qdeclarativedocumentgalleryitem.pro +++ b/tests/auto/qdeclarativedocumentgalleryitem/qdeclarativedocumentgalleryitem.pro @@ -5,3 +5,4 @@ QT += declarative INCLUDEPATH += ../../../src/imports/gallery/ SOURCES += tst_qdeclarativedocumentgalleryitem.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qdeclarativedocumentgallerymodel/qdeclarativedocumentgallerymodel.pro b/tests/auto/qdeclarativedocumentgallerymodel/qdeclarativedocumentgallerymodel.pro index 9096251..130b75c 100644 --- a/tests/auto/qdeclarativedocumentgallerymodel/qdeclarativedocumentgallerymodel.pro +++ b/tests/auto/qdeclarativedocumentgallerymodel/qdeclarativedocumentgallerymodel.pro @@ -5,3 +5,4 @@ QT += declarative INCLUDEPATH += ../../../src/imports/gallery/ SOURCES += tst_qdeclarativedocumentgallerymodel.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qdeclarativedocumentgallerytype/qdeclarativedocumentgallerytype.pro b/tests/auto/qdeclarativedocumentgallerytype/qdeclarativedocumentgallerytype.pro index 362e817..aba0298 100644 --- a/tests/auto/qdeclarativedocumentgallerytype/qdeclarativedocumentgallerytype.pro +++ b/tests/auto/qdeclarativedocumentgallerytype/qdeclarativedocumentgallerytype.pro @@ -5,3 +5,4 @@ QT += declarative INCLUDEPATH += ../../../src/imports/gallery/ SOURCES += tst_qdeclarativedocumentgallerytype.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qdocumentgallery/qdocumentgallery.pro b/tests/auto/qdocumentgallery/qdocumentgallery.pro index 5215c58..422667c 100644 --- a/tests/auto/qdocumentgallery/qdocumentgallery.pro +++ b/tests/auto/qdocumentgallery/qdocumentgallery.pro @@ -7,3 +7,4 @@ linux-*: { contains(QT_CONFIG, jsondb): DEFINES += QT_SIMPLE_ENABLED } +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgalleryabstractrequest/qgalleryabstractrequest.pro b/tests/auto/qgalleryabstractrequest/qgalleryabstractrequest.pro index cad5e57..dc2ef27 100644 --- a/tests/auto/qgalleryabstractrequest/qgalleryabstractrequest.pro +++ b/tests/auto/qgalleryabstractrequest/qgalleryabstractrequest.pro @@ -2,3 +2,4 @@ include(../auto.pri) SOURCES += tst_qgalleryabstractrequest.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgalleryabstractresponse/qgalleryabstractresponse.pro b/tests/auto/qgalleryabstractresponse/qgalleryabstractresponse.pro index 1f424b0..ea8ece5 100644 --- a/tests/auto/qgalleryabstractresponse/qgalleryabstractresponse.pro +++ b/tests/auto/qgalleryabstractresponse/qgalleryabstractresponse.pro @@ -1,3 +1,4 @@ include(../auto.pri) SOURCES += tst_qgalleryabstractresponse.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgalleryfilter/qgalleryfilter.pro b/tests/auto/qgalleryfilter/qgalleryfilter.pro index 1c1cadc..6ece174 100644 --- a/tests/auto/qgalleryfilter/qgalleryfilter.pro +++ b/tests/auto/qgalleryfilter/qgalleryfilter.pro @@ -1,3 +1,4 @@ include(../auto.pri) SOURCES += tst_qgalleryfilter.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgalleryitemrequest/qgalleryitemrequest.pro b/tests/auto/qgalleryitemrequest/qgalleryitemrequest.pro index 3a7002e..476f1b8 100644 --- a/tests/auto/qgalleryitemrequest/qgalleryitemrequest.pro +++ b/tests/auto/qgalleryitemrequest/qgalleryitemrequest.pro @@ -1,3 +1,4 @@ include(../auto.pri) SOURCES += tst_qgalleryitemrequest.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgalleryquerymodel/qgalleryquerymodel.pro b/tests/auto/qgalleryquerymodel/qgalleryquerymodel.pro index e19a030..81b3b0a 100644 --- a/tests/auto/qgalleryquerymodel/qgalleryquerymodel.pro +++ b/tests/auto/qgalleryquerymodel/qgalleryquerymodel.pro @@ -1,3 +1,4 @@ include(../auto.pri) SOURCES += tst_qgalleryquerymodel.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgalleryqueryrequest/qgalleryqueryrequest.pro b/tests/auto/qgalleryqueryrequest/qgalleryqueryrequest.pro index ad96d20..829f3c4 100644 --- a/tests/auto/qgalleryqueryrequest/qgalleryqueryrequest.pro +++ b/tests/auto/qgalleryqueryrequest/qgalleryqueryrequest.pro @@ -1,3 +1,4 @@ include(../auto.pri) SOURCES += tst_qgalleryqueryrequest.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgalleryresource/qgalleryresource.pro b/tests/auto/qgalleryresource/qgalleryresource.pro index e5947fe..f3f7873 100644 --- a/tests/auto/qgalleryresource/qgalleryresource.pro +++ b/tests/auto/qgalleryresource/qgalleryresource.pro @@ -1,3 +1,4 @@ include(../auto.pri) SOURCES += tst_qgalleryresource.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgallerytrackerresultset_tracker/qgallerytrackerresultset_tracker.pro b/tests/auto/qgallerytrackerresultset_tracker/qgallerytrackerresultset_tracker.pro index b9fe2d9..852ce3e 100644 --- a/tests/auto/qgallerytrackerresultset_tracker/qgallerytrackerresultset_tracker.pro +++ b/tests/auto/qgallerytrackerresultset_tracker/qgallerytrackerresultset_tracker.pro @@ -3,3 +3,4 @@ include(../auto.pri) QT += gallery-private SOURCES += tst_qgallerytrackerresultset.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgallerytrackerschema_tracker/qgallerytrackerschema_tracker.pro b/tests/auto/qgallerytrackerschema_tracker/qgallerytrackerschema_tracker.pro index 7ae2336..77869d1 100644 --- a/tests/auto/qgallerytrackerschema_tracker/qgallerytrackerschema_tracker.pro +++ b/tests/auto/qgallerytrackerschema_tracker/qgallerytrackerschema_tracker.pro @@ -3,3 +3,4 @@ include(../auto.pri) QT += gallery-private SOURCES += tst_qgallerytrackerschema.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgallerytyperequest/qgallerytyperequest.pro b/tests/auto/qgallerytyperequest/qgallerytyperequest.pro index 48e3a2e..bee07a4 100644 --- a/tests/auto/qgallerytyperequest/qgallerytyperequest.pro +++ b/tests/auto/qgallerytyperequest/qgallerytyperequest.pro @@ -1,3 +1,4 @@ include(../auto.pri) SOURCES += tst_qgallerytyperequest.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3