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 <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

34 files changed, 35 insertions, 1 deletions

diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro
index 981f8ee8f0..5baa15854c 100644
--- a/tests/auto/tools/moc/moc.pro
+++ b/tests/auto/tools/moc/moc.pro
@@ -28,3 +28,4 @@ contains(QT_CONFIG, dbus){
     DEFINES += WITH_DBUS
     QT += dbus
 }
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index 4217d5e73c..d568e7107d 100644
--- a/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/tests/auto/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -8,4 +8,5 @@ SOURCES += tst_qdbuscpp2xml.cpp \
 
 RESOURCES += qdbuscpp2xml.qrc
 
-HEADERS += test1.h
\ No newline at end of file
+HEADERS += test1.h
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index 8c29ff47c4..d2e2e19a36 100644
--- a/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/tests/auto/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -3,3 +3,4 @@ QT = core testlib
 TARGET = tst_qdbusxml2cpp
 SOURCES += tst_qdbusxml2cpp.cpp
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro
index 05f89e1691..23c488b8f6 100644
--- a/tests/auto/tools/qmake/qmake.pro
+++ b/tests/auto/tools/qmake/qmake.pro
@@ -8,3 +8,4 @@ QT = core testlib
 cross_compile: DEFINES += QMAKE_CROSS_COMPILED
 
 TESTDATA += testdata/*
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro b/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro
index e4f81e6e1e..69bd9f2677 100644
--- a/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro
+++ b/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro
@@ -5,3 +5,4 @@ QWERTY_BUNDLE.files = some-file "existing file" "non-existing file"
 QWERTY_BUNDLE.path = QwertyData
 
 QMAKE_BUNDLE_DATA = QWERTY_BUNDLE
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/comments/comments.pro b/tests/auto/tools/qmake/testdata/comments/comments.pro
index 5f1ac083fa..c6a13e8a88 100644
--- a/tests/auto/tools/qmake/testdata/comments/comments.pro
+++ b/tests/auto/tools/qmake/testdata/comments/comments.pro
@@ -31,3 +31,4 @@ LIST = 1 2 3 4$${LITERAL_HASH}five
 }
 
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/duplicateLibraryEntries/duplib.pro b/tests/auto/tools/qmake/testdata/duplicateLibraryEntries/duplib.pro
index 3c30bbbdcd..9e1f9f6195 100644
--- a/tests/auto/tools/qmake/testdata/duplicateLibraryEntries/duplib.pro
+++ b/tests/auto/tools/qmake/testdata/duplicateLibraryEntries/duplib.pro
@@ -8,3 +8,4 @@ JOINEDLIBS = $$join(LIBS, "_")
 
 
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/export_across_file_boundaries/foo.pro b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/foo.pro
index c3196cbceb..a0904bc4c2 100644
--- a/tests/auto/tools/qmake/testdata/export_across_file_boundaries/foo.pro
+++ b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/foo.pro
@@ -15,3 +15,4 @@ O_BAR=$$fromfile(oink.pri,BAR)
 
 
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro b/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro
index 442c9c767f..189da9fc59 100644
--- a/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro
+++ b/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro
@@ -10,3 +10,4 @@ HEADERS += object1.h \
            object8.h \
            object9.h
 SOURCES += main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro b/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro
index a4a7dc987d..3b7568d928 100644
--- a/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro
+++ b/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro
@@ -2,3 +2,4 @@ DESTDIR	= ./
 
 HEADERS += object1.h object2.h object3.h object4.h object5.h object6.h object7.h
 SOURCES += main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/func_export/func_export.pro b/tests/auto/tools/qmake/testdata/func_export/func_export.pro
index 0cff1f830e..bf328dc4fc 100644
--- a/tests/auto/tools/qmake/testdata/func_export/func_export.pro
+++ b/tests/auto/tools/qmake/testdata/func_export/func_export.pro
@@ -20,3 +20,4 @@ callDoExport()
 
 
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/func_variables/func_variables.pro b/tests/auto/tools/qmake/testdata/func_variables/func_variables.pro
index 9b786f7eda..1f4d8314bc 100644
--- a/tests/auto/tools/qmake/testdata/func_variables/func_variables.pro
+++ b/tests/auto/tools/qmake/testdata/func_variables/func_variables.pro
@@ -50,3 +50,4 @@ callTest($$value)
 
 
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/functions/functions.pro b/tests/auto/tools/qmake/testdata/functions/functions.pro
index 98e12b7650..32a9b6a137 100644
--- a/tests/auto/tools/qmake/testdata/functions/functions.pro
+++ b/tests/auto/tools/qmake/testdata/functions/functions.pro
@@ -157,3 +157,4 @@ else: \
 testReplace($$shell_quote($$in), $$out, "shell_quote")
 
 testReplace($$reverse($$list(one two three)), three two one, "reverse")
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/functions/infiletest.pro b/tests/auto/tools/qmake/testdata/functions/infiletest.pro
index b2492e19d9..7dca60191e 100644
--- a/tests/auto/tools/qmake/testdata/functions/infiletest.pro
+++ b/tests/auto/tools/qmake/testdata/functions/infiletest.pro
@@ -1,2 +1,3 @@
 DEFINES = QT_DLL
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/include_dir/foo.pro b/tests/auto/tools/qmake/testdata/include_dir/foo.pro
index 827a408274..a7949ad88f 100644
--- a/tests/auto/tools/qmake/testdata/include_dir/foo.pro
+++ b/tests/auto/tools/qmake/testdata/include_dir/foo.pro
@@ -10,3 +10,4 @@ SOURCES=\
 CONFIG -= debug_and_release_target
 QT += widgets
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/include_function/include_existing_file.pro b/tests/auto/tools/qmake/testdata/include_function/include_existing_file.pro
index 424062a9ac..737802370a 100644
--- a/tests/auto/tools/qmake/testdata/include_function/include_existing_file.pro
+++ b/tests/auto/tools/qmake/testdata/include_function/include_existing_file.pro
@@ -5,3 +5,4 @@ include(existing_file.pri)
 # Test to see if by specifying full set of parameters to include()
 #  succeeds when the specified filed to include exists 
 include(existing_file.pri, "", false)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/include_function/include_missing_file.pro b/tests/auto/tools/qmake/testdata/include_function/include_missing_file.pro
index 0b59981240..0436d8406d 100644
--- a/tests/auto/tools/qmake/testdata/include_function/include_missing_file.pro
+++ b/tests/auto/tools/qmake/testdata/include_function/include_missing_file.pro
@@ -1,3 +1,4 @@
 # Test to see if include(), by default, fails when the specific file 
 #   to include does not exist
 include(missing_file.pri)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro b/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro
index 542b9ff516..f013ae1a85 100644
--- a/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro
+++ b/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro
@@ -1,3 +1,4 @@
 # Specifying full set of parameters to include() to test that a warning 
 #   is shown for this non-existing file.
 include(missing_file.pri, "", false)
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/install_depends/foo.pro b/tests/auto/tools/qmake/testdata/install_depends/foo.pro
index 357216bff8..d6d424671a 100644
--- a/tests/auto/tools/qmake/testdata/install_depends/foo.pro
+++ b/tests/auto/tools/qmake/testdata/install_depends/foo.pro
@@ -21,3 +21,4 @@ INSTALLS+=target
 
 
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/one_space/one_space.pro b/tests/auto/tools/qmake/testdata/one_space/one_space.pro
index c5ffa40742..651035df69 100644
--- a/tests/auto/tools/qmake/testdata/one_space/one_space.pro
+++ b/tests/auto/tools/qmake/testdata/one_space/one_space.pro
@@ -3,3 +3,4 @@ CONFIG		+= qt warn_on
 SOURCES		= main.cpp
 TARGET		= "one space"
 DESTDIR		= ./
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/operators/operators.pro b/tests/auto/tools/qmake/testdata/operators/operators.pro
index d6eb3d13c7..7d906f58f7 100644
--- a/tests/auto/tools/qmake/testdata/operators/operators.pro
+++ b/tests/auto/tools/qmake/testdata/operators/operators.pro
@@ -22,3 +22,4 @@ VAR ~= s/QT_+/Q_
    message( "FAILED: ~=" )
 }
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/prompt/prompt.pro b/tests/auto/tools/qmake/testdata/prompt/prompt.pro
index 238022c755..31c3c05dfb 100644
--- a/tests/auto/tools/qmake/testdata/prompt/prompt.pro
+++ b/tests/auto/tools/qmake/testdata/prompt/prompt.pro
@@ -1,2 +1,3 @@
 # a = $$prompt(Prompteroo)
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro
index 13d4d6c4ad..c3dd252d25 100644
--- a/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro
+++ b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro
@@ -22,3 +22,4 @@ DESTDIR		= ./
 
 
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/shadow_files/foo.pro b/tests/auto/tools/qmake/testdata/shadow_files/foo.pro
index fc1e7e586d..97a5410b25 100644
--- a/tests/auto/tools/qmake/testdata/shadow_files/foo.pro
+++ b/tests/auto/tools/qmake/testdata/shadow_files/foo.pro
@@ -15,3 +15,4 @@ INSTALLS+=test
 
 
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
index 94af3cd3ba..a677388fae 100644
--- a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
+++ b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
@@ -6,3 +6,4 @@ SOURCES		= test_file.cpp \
 RESOURCES = test.qrc
 TARGET		= simple_app
 DESTDIR		= ./
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro
index 09c18d1631..f74067e2c9 100644
--- a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro
+++ b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro
@@ -12,3 +12,4 @@ MOC_DIR	= tmp
 OBJECTS_DIR = tmp
 TARGET	= simple_dll
 DESTDIR	= ./
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro
index 209bba6348..bc239ad1a8 100644
--- a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro
+++ b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro
@@ -12,3 +12,4 @@ OBJECTS_DIR = tmp
 TARGET	= simple_lib
 DESTDIR	= ./
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro
index 2db08a29af..c5b9fdd7dc 100644
--- a/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro
+++ b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro
@@ -3,3 +3,4 @@ SOURCES  = main.cpp
 
 extratarget.commands = @echo extra target worked OK
 QMAKE_EXTRA_TARGETS += extratarget
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro
index 4191f142d8..df8e81aa7b 100644
--- a/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro
@@ -5,3 +5,4 @@ SOURCES		= test_file.cpp \
 		  	main.cpp
 TARGET		= simple_app
 DESTDIR		= ./
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
index 09c18d1631..f74067e2c9 100644
--- a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
@@ -12,3 +12,4 @@ MOC_DIR	= tmp
 OBJECTS_DIR = tmp
 TARGET	= simple_dll
 DESTDIR	= ./
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/substitutes/test.pro b/tests/auto/tools/qmake/testdata/substitutes/test.pro
index 8c003275a2..69e1f676ac 100644
--- a/tests/auto/tools/qmake/testdata/substitutes/test.pro
+++ b/tests/auto/tools/qmake/testdata/substitutes/test.pro
@@ -6,3 +6,4 @@ indirect.output = $$OUT_PWD/sub/indirect_test.txt
 copy.input = $$PWD/copy.txt
 copy.output = $$OUT_PWD/copy_test.txt
 copy.CONFIG = verbatim
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/qmake/testdata/variables/variables.pro b/tests/auto/tools/qmake/testdata/variables/variables.pro
index d5d1e56939..463aed53f6 100644
--- a/tests/auto/tools/qmake/testdata/variables/variables.pro
+++ b/tests/auto/tools/qmake/testdata/variables/variables.pro
@@ -12,3 +12,4 @@ JOINEDNEWVAR = $$join( NEWVAR, "-" )
 }
 
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/rcc/rcc.pro b/tests/auto/tools/rcc/rcc.pro
index 264b8ecc66..160697b06c 100644
--- a/tests/auto/tools/rcc/rcc.pro
+++ b/tests/auto/tools/rcc/rcc.pro
@@ -3,3 +3,4 @@ QT = core testlib
 TARGET = tst_rcc
 
 SOURCES += tst_rcc.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/tools/uic/uic.pro b/tests/auto/tools/uic/uic.pro
index 98463c3944..bee11660a4 100644
--- a/tests/auto/tools/uic/uic.pro
+++ b/tests/auto/tools/uic/uic.pro
@@ -6,3 +6,4 @@ TARGET = tst_uic
 
 # This test is not run on wince (I think)
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0