From 672b5b7ab668c67477d36edfcda98caafd35edc0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 1 Aug 2012 13:19:40 +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: I8129c3ef3cb58541c95a32d083850d9e7f768927 Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart --- tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro | 1 + tests/benchmarks/corelib/io/qdir/10000/10000.pro | 1 + tests/benchmarks/corelib/io/qdir/tree/tree.pro | 1 + tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro | 1 + tests/benchmarks/corelib/io/qfile/qfile.pro | 1 + tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro | 1 + tests/benchmarks/corelib/io/qiodevice/qiodevice.pro | 1 + tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro | 1 + tests/benchmarks/corelib/io/qurl/qurl.pro | 1 + tests/benchmarks/corelib/json/json.pro | 1 + tests/benchmarks/corelib/kernel/events/events.pro | 1 + tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro | 1 + tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro | 1 + tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro | 1 + tests/benchmarks/corelib/kernel/qobject/qobject.pro | 1 + .../corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro | 1 + tests/benchmarks/corelib/kernel/qvariant/qvariant.pro | 1 + tests/benchmarks/corelib/plugin/quuid/quuid.pro | 1 + tests/benchmarks/corelib/thread/qmutex/qmutex.pro | 1 + tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro | 1 + tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro | 1 + .../corelib/tools/containers-associative/containers-associative.pro | 1 + .../corelib/tools/containers-sequential/containers-sequential.pro | 1 + tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro | 1 + tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro | 1 + tests/benchmarks/corelib/tools/qchar/qchar.pro | 1 + tests/benchmarks/corelib/tools/qcontiguouscache/qcontiguouscache.pro | 1 + tests/benchmarks/corelib/tools/qhash/qhash.pro | 1 + tests/benchmarks/corelib/tools/qlist/qlist.pro | 1 + tests/benchmarks/corelib/tools/qmap/qmap.pro | 1 + tests/benchmarks/corelib/tools/qrect/qrect.pro | 1 + tests/benchmarks/corelib/tools/qregexp/qregexp.pro | 1 + tests/benchmarks/corelib/tools/qstring/qstring.pro | 1 + tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro | 1 + tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro | 1 + tests/benchmarks/corelib/tools/qvector/qvector.pro | 1 + 36 files changed, 36 insertions(+) (limited to 'tests/benchmarks/corelib') diff --git a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro index 5ee577c256..5563004ca8 100644 --- a/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro +++ b/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro @@ -4,3 +4,4 @@ SOURCES += main.cpp TESTDATA = utf-8.txt +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/io/qdir/10000/10000.pro b/tests/benchmarks/corelib/io/qdir/10000/10000.pro index 2e83dad071..88654b3575 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/10000.pro +++ b/tests/benchmarks/corelib/io/qdir/10000/10000.pro @@ -4,3 +4,4 @@ TARGET = tst_bench_qdir_10000 SOURCES += bench_qdir_10000.cpp QT = core testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/io/qdir/tree/tree.pro b/tests/benchmarks/corelib/io/qdir/tree/tree.pro index 2998a13b57..fbc575c585 100644 --- a/tests/benchmarks/corelib/io/qdir/tree/tree.pro +++ b/tests/benchmarks/corelib/io/qdir/tree/tree.pro @@ -5,3 +5,4 @@ SOURCES += bench_qdir_tree.cpp RESOURCES += bench_qdir_tree.qrc QT = core testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro index 3cfb0b44de..e61c50cd5d 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro +++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro @@ -13,3 +13,4 @@ wince* { DEPLOYMENT += corelibdir } +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/io/qfile/qfile.pro b/tests/benchmarks/corelib/io/qfile/qfile.pro index 5f7b9af73f..6716dd549d 100644 --- a/tests/benchmarks/corelib/io/qfile/qfile.pro +++ b/tests/benchmarks/corelib/io/qfile/qfile.pro @@ -4,3 +4,4 @@ QT = core core-private testlib win32: DEFINES+= _CRT_SECURE_NO_WARNINGS SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro index 42e8708b02..b8cb50abf3 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro @@ -7,3 +7,4 @@ QT += core-private testlib CONFIG += release SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro index 20b02d190a..3b06fcbce6 100644 --- a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro +++ b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro @@ -7,3 +7,4 @@ QT = core testlib CONFIG += release SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro index 758930c139..3dcba655f2 100644 --- a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro +++ b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro @@ -6,3 +6,4 @@ QT = core testlib CONFIG += release SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/io/qurl/qurl.pro b/tests/benchmarks/corelib/io/qurl/qurl.pro index 52f7bdc8b6..e3beedc472 100644 --- a/tests/benchmarks/corelib/io/qurl/qurl.pro +++ b/tests/benchmarks/corelib/io/qurl/qurl.pro @@ -4,3 +4,4 @@ QT = core testlib win32: DEFINES+= _CRT_SECURE_NO_WARNINGS SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/json/json.pro b/tests/benchmarks/corelib/json/json.pro index 004f4b123e..77c9ca3ffe 100644 --- a/tests/benchmarks/corelib/json/json.pro +++ b/tests/benchmarks/corelib/json/json.pro @@ -5,3 +5,4 @@ CONFIG -= app_bundle SOURCES += tst_bench_qtbinaryjson.cpp TESTDATA = numbers.json test.json +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/kernel/events/events.pro b/tests/benchmarks/corelib/kernel/events/events.pro index 798a880e5b..01cba51329 100644 --- a/tests/benchmarks/corelib/kernel/events/events.pro +++ b/tests/benchmarks/corelib/kernel/events/events.pro @@ -4,3 +4,4 @@ TARGET = tst_bench_events QT = core testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro index 6896b3ff55..df5450f88d 100644 --- a/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro +++ b/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro @@ -4,3 +4,4 @@ TEMPLATE = app TARGET = tst_bench_qcoreapplication SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro index 47d2acb9b1..39410e90fd 100644 --- a/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qmetaobject/qmetaobject.pro @@ -3,3 +3,4 @@ QT += widgets testlib TARGET = tst_bench_qmetaobject SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro b/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro index 83d0708b60..a97e0ffab8 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro +++ b/tests/benchmarks/corelib/kernel/qmetatype/qmetatype.pro @@ -4,3 +4,4 @@ TARGET = tst_bench_qmetatype SOURCES += tst_qmetatype.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/kernel/qobject/qobject.pro b/tests/benchmarks/corelib/kernel/qobject/qobject.pro index e611eff0a2..57243405e1 100644 --- a/tests/benchmarks/corelib/kernel/qobject/qobject.pro +++ b/tests/benchmarks/corelib/kernel/qobject/qobject.pro @@ -5,3 +5,4 @@ TARGET = tst_bench_qobject HEADERS += object.h SOURCES += main.cpp object.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro index a5daf0f8ef..d43342cd50 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/qtimer_vs_qmetaobject.pro @@ -9,3 +9,4 @@ CONFIG += release SOURCES += tst_qtimer_vs_qmetaobject.cpp QT = core testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro index 8ea7200d53..afacbd2c2b 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro +++ b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro @@ -6,3 +6,4 @@ CONFIG += release SOURCES += tst_qvariant.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/plugin/quuid/quuid.pro b/tests/benchmarks/corelib/plugin/quuid/quuid.pro index 8f88bb85b4..3f77ff7821 100644 --- a/tests/benchmarks/corelib/plugin/quuid/quuid.pro +++ b/tests/benchmarks/corelib/plugin/quuid/quuid.pro @@ -3,3 +3,4 @@ TARGET = tst_bench_quuid SOURCES += tst_quuid.cpp QT = core testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/thread/qmutex/qmutex.pro b/tests/benchmarks/corelib/thread/qmutex/qmutex.pro index ec87f60919..9f906b433f 100644 --- a/tests/benchmarks/corelib/thread/qmutex/qmutex.pro +++ b/tests/benchmarks/corelib/thread/qmutex/qmutex.pro @@ -3,3 +3,4 @@ TARGET = tst_bench_qmutex QT = core testlib SOURCES += tst_qmutex.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro b/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro index 95afc951bc..f44763c39c 100644 --- a/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro +++ b/tests/benchmarks/corelib/thread/qthreadstorage/qthreadstorage.pro @@ -3,3 +3,4 @@ TARGET = tst_bench_qthreadstorage SOURCES += tst_qthreadstorage.cpp QT = core testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro b/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro index 43c7921a93..8adf8a732f 100644 --- a/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro +++ b/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro @@ -2,3 +2,4 @@ TEMPLATE = app TARGET = tst_bench_qwaitcondition QT = core testlib SOURCES += tst_qwaitcondition.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro index 49edcbee70..0d0f8405d8 100644 --- a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro +++ b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro @@ -4,3 +4,4 @@ TARGET = tst_bench_containers-associative QT = core testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro index 6f731cb6d8..0b5b070864 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro +++ b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro @@ -4,3 +4,4 @@ TARGET = tst_bench_containers-sequential QT = core testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro b/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro index f54f8320d4..69c2add07b 100644 --- a/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro +++ b/tests/benchmarks/corelib/tools/qalgorithms/qalgorithms.pro @@ -1,3 +1,4 @@ TARGET = tst_bench_qalgorithms QT = core testlib SOURCES = tst_qalgorithms.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro index 23d8dae18f..14bf1d8272 100644 --- a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro +++ b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro @@ -5,3 +5,4 @@ QT = core testlib CONFIG += release SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qchar/qchar.pro b/tests/benchmarks/corelib/tools/qchar/qchar.pro index 80a9861f48..1137e91cab 100644 --- a/tests/benchmarks/corelib/tools/qchar/qchar.pro +++ b/tests/benchmarks/corelib/tools/qchar/qchar.pro @@ -1,3 +1,4 @@ TARGET = tst_bench_qchar QT = core testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qcontiguouscache/qcontiguouscache.pro b/tests/benchmarks/corelib/tools/qcontiguouscache/qcontiguouscache.pro index fe74dafef4..0739d3dea6 100644 --- a/tests/benchmarks/corelib/tools/qcontiguouscache/qcontiguouscache.pro +++ b/tests/benchmarks/corelib/tools/qcontiguouscache/qcontiguouscache.pro @@ -5,3 +5,4 @@ SOURCES += main.cpp CONFIG += parallel_test QT = core testlib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qhash/qhash.pro b/tests/benchmarks/corelib/tools/qhash/qhash.pro index 40f661c116..bdef2c74aa 100644 --- a/tests/benchmarks/corelib/tools/qhash/qhash.pro +++ b/tests/benchmarks/corelib/tools/qhash/qhash.pro @@ -3,3 +3,4 @@ QT = core testlib INCLUDEPATH += . SOURCES += main.cpp outofline.cpp CONFIG += release +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qlist/qlist.pro b/tests/benchmarks/corelib/tools/qlist/qlist.pro index c83bc455d2..eba4066cf5 100644 --- a/tests/benchmarks/corelib/tools/qlist/qlist.pro +++ b/tests/benchmarks/corelib/tools/qlist/qlist.pro @@ -2,3 +2,4 @@ TARGET = tst_bench_qlist QT = core testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qmap/qmap.pro b/tests/benchmarks/corelib/tools/qmap/qmap.pro index 6a0c8d62bd..bb3d33a3a1 100644 --- a/tests/benchmarks/corelib/tools/qmap/qmap.pro +++ b/tests/benchmarks/corelib/tools/qmap/qmap.pro @@ -3,3 +3,4 @@ QT = core testlib INCLUDEPATH += . SOURCES += main.cpp CONFIG += release +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qrect/qrect.pro b/tests/benchmarks/corelib/tools/qrect/qrect.pro index 42cfcd8924..361e734a36 100644 --- a/tests/benchmarks/corelib/tools/qrect/qrect.pro +++ b/tests/benchmarks/corelib/tools/qrect/qrect.pro @@ -5,3 +5,4 @@ QT = core testlib CONFIG += release SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index 59e7d19244..6e466aeab6 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -17,3 +17,4 @@ DEFINES+=HAVE_BOOST LIBS+=-lboost_regex } +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/tools/qstring/qstring.pro index cf2ee24c6d..3b86d9d372 100644 --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro @@ -9,3 +9,4 @@ sse4:QMAKE_CXXFLAGS += -msse4 else:ssse3:QMAKE_FLAGS += -mssse3 else:sse2:QMAKE_CXXFLAGS += -msse2 neon:QMAKE_CXXFLAGS += -mfpu=neon +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro b/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro index fa4cbe3c13..128deab8f2 100644 --- a/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro +++ b/tests/benchmarks/corelib/tools/qstringbuilder/qstringbuilder.pro @@ -9,3 +9,4 @@ QT = core testlib CONFIG += release SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro index 5803e7da0e..823b3d4d46 100644 --- a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro +++ b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro @@ -3,3 +3,4 @@ CONFIG -= debug CONFIG += release QT = core testlib SOURCES += main.cpp +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/corelib/tools/qvector/qvector.pro b/tests/benchmarks/corelib/tools/qvector/qvector.pro index 24a65d8ee8..8c118e64e8 100644 --- a/tests/benchmarks/corelib/tools/qvector/qvector.pro +++ b/tests/benchmarks/corelib/tools/qvector/qvector.pro @@ -3,3 +3,4 @@ QT = core testlib core-private INCLUDEPATH += . SOURCES += main.cpp outofline.cpp CONFIG += release +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3