summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-08-01 14:58:31 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-01 23:33:42 +0200
commit955b3d82646a6487fa0df2c0f4772566e8cb0bf3 (patch)
treec2a794933d60a6b925f16ccf59799afec9d94d7f
parent96dae368bf54c87e15f45bd6efb92f63c412dad3 (diff)
Set the Qt API level to compatibility mode in all tests and in one lib.
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. In QtJson's case, it's using old itemviews API in one library and those cases haven't been ported yet. Task-number: QTBUG-25053 Change-Id: If732cdc29097fe3a3117b8ed2b392f6f154360ef Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--src/client/client.pro2
-rw-r--r--tests/auto/accesscontrol/accesscontrol.pro2
-rw-r--r--tests/auto/client/client.pro1
-rw-r--r--tests/auto/hbtree/hbtree.pro1
-rw-r--r--tests/auto/jsondb-listmodel/jsondb-listmodel.pro1
-rw-r--r--tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro1
-rw-r--r--tests/auto/jsondblistmodel/jsondblistmodel.pro1
-rw-r--r--tests/auto/jsondbnotification/jsondbnotification.pro1
-rw-r--r--tests/auto/jsondbpartition/jsondbpartition.pro1
-rw-r--r--tests/auto/jsondbqueryobject/jsondbqueryobject.pro1
-rw-r--r--tests/auto/jsondbscriptengine/jsondbscriptengine.pro1
-rw-r--r--tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro1
-rw-r--r--tests/auto/jsonstream/jsonstream.pro1
-rw-r--r--tests/auto/partition/partition.pro1
-rw-r--r--tests/auto/qbtree/qbtree.pro1
-rw-r--r--tests/auto/qjsondbflushrequest/qjsondbflushrequest.pro1
-rw-r--r--tests/auto/qjsondbrequest/qjsondbrequest.pro1
-rw-r--r--tests/auto/qjsondbwatcher/qjsondbwatcher.pro1
-rw-r--r--tests/auto/queries/queries.pro1
-rw-r--r--tests/auto/storage/storage.pro1
-rw-r--r--tests/benchmarks/btrees/btrees.pro1
-rw-r--r--tests/benchmarks/client/client.pro1
-rw-r--r--tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro1
-rw-r--r--tests/benchmarks/jsondbobject/jsondbobject.pro2
-rw-r--r--tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro1
-rw-r--r--tests/benchmarks/partition/partition.pro2
-rw-r--r--tests/manual/bits/bits.pro1
27 files changed, 31 insertions, 0 deletions
diff --git a/src/client/client.pro b/src/client/client.pro
index 065d497f..844d82ed 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -52,3 +52,5 @@ SOURCES += \
qjsondbmodelcache_p.cpp \
qjsondbmodelutils_p.cpp \
qjsondbquerymodel_p.cpp
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/accesscontrol/accesscontrol.pro b/tests/auto/accesscontrol/accesscontrol.pro
index c717bd3d..6bf9c4a2 100644
--- a/tests/auto/accesscontrol/accesscontrol.pro
+++ b/tests/auto/accesscontrol/accesscontrol.pro
@@ -10,3 +10,5 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\"
RESOURCES+= accesscontrol.qrc
SOURCES += \
testjsondb.cpp \
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro
index bdb0e9d3..cf5ce2d3 100644
--- a/tests/auto/client/client.pro
+++ b/tests/auto/client/client.pro
@@ -21,3 +21,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/hbtree/hbtree.pro b/tests/auto/hbtree/hbtree.pro
index 6cd4fed1..61ffa3d1 100644
--- a/tests/auto/hbtree/hbtree.pro
+++ b/tests/auto/hbtree/hbtree.pro
@@ -8,3 +8,4 @@ CONFIG += testcase
SOURCES += \
main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/jsondb-listmodel/jsondb-listmodel.pro b/tests/auto/jsondb-listmodel/jsondb-listmodel.pro
index e2b83c50..364c654c 100644
--- a/tests/auto/jsondb-listmodel/jsondb-listmodel.pro
+++ b/tests/auto/jsondb-listmodel/jsondb-listmodel.pro
@@ -23,3 +23,4 @@ data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro b/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
index 40187267..f77fa705 100644
--- a/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
+++ b/tests/auto/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
@@ -22,3 +22,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/jsondblistmodel/jsondblistmodel.pro b/tests/auto/jsondblistmodel/jsondblistmodel.pro
index ed86def4..3ca53964 100644
--- a/tests/auto/jsondblistmodel/jsondblistmodel.pro
+++ b/tests/auto/jsondblistmodel/jsondblistmodel.pro
@@ -22,3 +22,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/jsondbnotification/jsondbnotification.pro b/tests/auto/jsondbnotification/jsondbnotification.pro
index 1fb09628..fd10277c 100644
--- a/tests/auto/jsondbnotification/jsondbnotification.pro
+++ b/tests/auto/jsondbnotification/jsondbnotification.pro
@@ -22,3 +22,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/jsondbpartition/jsondbpartition.pro b/tests/auto/jsondbpartition/jsondbpartition.pro
index c4d4b8d0..0abe7149 100644
--- a/tests/auto/jsondbpartition/jsondbpartition.pro
+++ b/tests/auto/jsondbpartition/jsondbpartition.pro
@@ -22,3 +22,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/jsondbqueryobject/jsondbqueryobject.pro b/tests/auto/jsondbqueryobject/jsondbqueryobject.pro
index 00b48012..ae09ed6d 100644
--- a/tests/auto/jsondbqueryobject/jsondbqueryobject.pro
+++ b/tests/auto/jsondbqueryobject/jsondbqueryobject.pro
@@ -22,3 +22,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/jsondbscriptengine/jsondbscriptengine.pro b/tests/auto/jsondbscriptengine/jsondbscriptengine.pro
index 5cffe80d..d6d6d972 100644
--- a/tests/auto/jsondbscriptengine/jsondbscriptengine.pro
+++ b/tests/auto/jsondbscriptengine/jsondbscriptengine.pro
@@ -15,3 +15,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro b/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
index cc7e7de2..7f157b23 100644
--- a/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
+++ b/tests/auto/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
@@ -22,3 +22,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/jsonstream/jsonstream.pro b/tests/auto/jsonstream/jsonstream.pro
index f2f75c2f..3b4e9ae0 100644
--- a/tests/auto/jsonstream/jsonstream.pro
+++ b/tests/auto/jsonstream/jsonstream.pro
@@ -9,3 +9,4 @@ include($$PWD/../../../src/jsonstream/jsonstream.pri)
SOURCES += \
test-jsonstream.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/partition/partition.pro b/tests/auto/partition/partition.pro
index c075828a..290ae9ec 100644
--- a/tests/auto/partition/partition.pro
+++ b/tests/auto/partition/partition.pro
@@ -28,3 +28,4 @@ config_icu {
DEFINES += NO_COLLATION_SUPPORT
}
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qbtree/qbtree.pro b/tests/auto/qbtree/qbtree.pro
index c63b5683..39e104f2 100644
--- a/tests/auto/qbtree/qbtree.pro
+++ b/tests/auto/qbtree/qbtree.pro
@@ -8,3 +8,4 @@ CONFIG += testcase
SOURCES += \
main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qjsondbflushrequest/qjsondbflushrequest.pro b/tests/auto/qjsondbflushrequest/qjsondbflushrequest.pro
index f3cf9b8c..b1966658 100644
--- a/tests/auto/qjsondbflushrequest/qjsondbflushrequest.pro
+++ b/tests/auto/qjsondbflushrequest/qjsondbflushrequest.pro
@@ -19,3 +19,4 @@ data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qjsondbrequest/qjsondbrequest.pro b/tests/auto/qjsondbrequest/qjsondbrequest.pro
index dbf9d816..e60dedc5 100644
--- a/tests/auto/qjsondbrequest/qjsondbrequest.pro
+++ b/tests/auto/qjsondbrequest/qjsondbrequest.pro
@@ -19,3 +19,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qjsondbwatcher/qjsondbwatcher.pro b/tests/auto/qjsondbwatcher/qjsondbwatcher.pro
index 0297b2dd..bf8ff1e1 100644
--- a/tests/auto/qjsondbwatcher/qjsondbwatcher.pro
+++ b/tests/auto/qjsondbwatcher/qjsondbwatcher.pro
@@ -19,3 +19,4 @@ OTHER_FILES += \
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/queries/queries.pro b/tests/auto/queries/queries.pro
index 76b4f41c..a855916a 100644
--- a/tests/auto/queries/queries.pro
+++ b/tests/auto/queries/queries.pro
@@ -13,3 +13,4 @@ SOURCES += \
OTHER_FILES += \
dataset.json
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/storage/storage.pro b/tests/auto/storage/storage.pro
index 985c2439..70192dd6 100644
--- a/tests/auto/storage/storage.pro
+++ b/tests/auto/storage/storage.pro
@@ -25,3 +25,4 @@ DEFINES += NSS_PREFIX=\\\"$$NSS_PREFIX\\\"
TEMPLATE = app
SOURCES += tst_storage.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/btrees/btrees.pro b/tests/benchmarks/btrees/btrees.pro
index c569fbd7..643557b6 100644
--- a/tests/benchmarks/btrees/btrees.pro
+++ b/tests/benchmarks/btrees/btrees.pro
@@ -9,3 +9,4 @@ CONFIG += testcase
SOURCES += \
main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/client/client.pro b/tests/benchmarks/client/client.pro
index 1f6ba23e..8ae9aac0 100644
--- a/tests/benchmarks/client/client.pro
+++ b/tests/benchmarks/client/client.pro
@@ -16,3 +16,4 @@ OTHER_FILES += partitions.json
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro b/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
index acd1a102..6cdde450 100644
--- a/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
+++ b/tests/benchmarks/jsondbcachinglistmodel/jsondbcachinglistmodel.pro
@@ -18,3 +18,4 @@ OTHER_FILES += partitions.json
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/jsondbobject/jsondbobject.pro b/tests/benchmarks/jsondbobject/jsondbobject.pro
index 5eec3140..3a282c48 100644
--- a/tests/benchmarks/jsondbobject/jsondbobject.pro
+++ b/tests/benchmarks/jsondbobject/jsondbobject.pro
@@ -12,3 +12,5 @@ include(../../../src/hbtree/hbtree.pri)
SOURCES += \
bench_jsondbobject.cpp \
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro b/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
index 1e70d181..a325d7e0 100644
--- a/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
+++ b/tests/benchmarks/jsondbsortinglistmodel/jsondbsortinglistmodel.pro
@@ -18,3 +18,4 @@ OTHER_FILES += partitions.json
data.files = $$OTHER_FILES
data.path = $$[QT_INSTALL_TESTS]/$$TARGET
INSTALLS += data
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/partition/partition.pro b/tests/benchmarks/partition/partition.pro
index dde540e7..2d91e841 100644
--- a/tests/benchmarks/partition/partition.pro
+++ b/tests/benchmarks/partition/partition.pro
@@ -14,3 +14,5 @@ include(../../../src/hbtree/hbtree.pri)
SOURCES += \
bench_partition.cpp \
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/manual/bits/bits.pro b/tests/manual/bits/bits.pro
index 85d613b5..83f4453f 100644
--- a/tests/manual/bits/bits.pro
+++ b/tests/manual/bits/bits.pro
@@ -9,3 +9,4 @@ include($$PWD/../../../src/3rdparty/btree/btree.pri)
SOURCES += \
main.cpp \
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0