diff --git a/src/linguist/linguist/phraseview.cpp b/src/linguist/linguist/phraseview.cpp
index 85c703c280994fdb2db0f3e227c5b8997f0b6c76..aabcc68d6f2cfe95a6c6ca282e3c4f719611fb8c 100644
--- a/src/linguist/linguist/phraseview.cpp
+++ b/src/linguist/linguist/phraseview.cpp
@@ -86,7 +86,7 @@ PhraseView::PhraseView(MultiDataModel *model, QList<QHash<QString, QList<Phrase
     for (int i = 0; i < 10; i++)
         (void) new GuessShortcut(i, this, SLOT(guessShortcut(int)));
 
-    header()->setResizeMode(QHeaderView::Interactive);
+    header()->setSectionResizeMode(QHeaderView::Interactive);
     header()->setSectionsClickable(true);
     header()->restoreState(QSettings().value(phraseViewHeaderKey()).toByteArray());
 
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index df49c6f49635db4f53158b706582d3a8b46b75eb..7a17970436365f0d3fdfa80898f57819d0f3871f 100644
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -2,3 +2,4 @@ TARGET = tst_headersclean
 CONFIG += testcase
 SOURCES  += tst_headersclean.cpp
 QT = core help testlib
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lconvert/lconvert.pro b/tests/auto/linguist/lconvert/lconvert.pro
index af29c583702a86200d67ffffa973fe7ba8632b72..f1761e6973b9ac6b593e65ce09940a11bde9e29f 100644
--- a/tests/auto/linguist/lconvert/lconvert.pro
+++ b/tests/auto/linguist/lconvert/lconvert.pro
@@ -7,3 +7,4 @@ TARGET = tst_lconvert
 SOURCES += tst_lconvert.cpp
 # testlupdate.cpp
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lrelease/lrelease.pro b/tests/auto/linguist/lrelease/lrelease.pro
index ba69b7ff344877f963cade0624a2c9885f8633ec..7da0e42b8890571b2733d6320a6f644e6d5714fd 100644
--- a/tests/auto/linguist/lrelease/lrelease.pro
+++ b/tests/auto/linguist/lrelease/lrelease.pro
@@ -3,3 +3,4 @@ QT = core testlib
 TARGET = tst_lrelease
 
 SOURCES += tst_lrelease.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/lupdate.pro b/tests/auto/linguist/lupdate/lupdate.pro
index 7c385667b5c4f06ebc82141802b1484f88479a52..f2becebd54474b99ee6f8b6e85704d28e7d09d3a 100644
--- a/tests/auto/linguist/lupdate/lupdate.pro
+++ b/tests/auto/linguist/lupdate/lupdate.pro
@@ -9,3 +9,4 @@ TARGET = tst_lupdate
 
 SOURCES += tst_lupdate.cpp
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
index d4dcda88040a83a5c4fc7d4ca8c196cb7333cda9..5761863e170e58df88054ba82be2c3524d9c492b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
@@ -1,3 +1,4 @@
 SOURCES += src\\main.cpp
 
 TRANSLATIONS = ts\\project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
index 7225608b80e15750d63f81084a375b23f4a13430..f133c60d266e8520ce0432705e3241b9dce1bf0b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro
@@ -5,3 +5,4 @@ TRANSLATIONS = project.ts
 
 CODECFORTR = utf-8
 CODECFORSRC = utf-8
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
index 64f3c8590cdd6de09054f2685bc6c762319206d0..884fc5273d2e13f4973a19b5fe646bad14407022 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro
@@ -4,3 +4,4 @@ CONFIG+= console
 TRANSLATIONS = project.ts
 
 CODECFORTR = CP1251
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
index d5697ebb9aeb87c4ec76ae94faa878b8509cfcce..6d21e0d2ff5cd286d58c10eb9bb118c5a657a455 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro
@@ -4,3 +4,4 @@ CONFIG += console
 TRANSLATIONS = project.ts
 
 CODECFORTR = CP1252
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
index c95939c3bfe4219e4b5f8c60b90695330c4d63ac..8918087e8090eeefaa341c01aee508fa62483a2d 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro
@@ -5,3 +5,4 @@ TRANSLATIONS = project.ts
 
 CODECFORSRC = CP1252
 CODECFORTR = UTF-8
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.pro
index 00a4dc4885973b1e1d6b726142179bcbccd4f15c..1a2f50e413d4bef7bcd500b2aa0dac29d0f8d7c6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.pro
@@ -2,3 +2,4 @@ SOURCES += main.cpp
 
 TRANSLATIONS = project.ts
 CODECFORTR = latin1
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.pro b/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.pro
index 4fddb024287c3d92d7b52a45a477e4f46ddd3065..2d08a07de99296c3941befcd82548ede5337273f 100644
--- a/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.pro
@@ -2,3 +2,4 @@ SOURCES += main.cpp
 
 TRANSLATIONS = project.ts
 CODECFORTR = latin2
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/from_subdir/translations/translations.pro b/tests/auto/linguist/lupdate/testdata/good/from_subdir/translations/translations.pro
index 1815c37dcfc3cd0ad525611458972dd118d7b5e6..1997e035db98d3d5aec92d0760c95c6c5dcc1742 100644
--- a/tests/auto/linguist/lupdate/testdata/good/from_subdir/translations/translations.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/from_subdir/translations/translations.pro
@@ -5,3 +5,4 @@ SOURCES += main.cpp
 HEADERS += main.h
 
 TRANSLATIONS += ../project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro
index 759bea0682663f536cacb06bdfa8b4170d0d47ef..7a7ad5ee761151b85c710ceb6872b33c40619c1c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro
@@ -1,3 +1,4 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
index 759bea0682663f536cacb06bdfa8b4170d0d47ef..7a7ad5ee761151b85c710ceb6872b33c40619c1c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro
@@ -1,3 +1,4 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
index 614985830db26d4a987758d52ad5e131326ab46e..b7a9f77e5954eccac146024ba0cfccad008abe3f 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro
@@ -1,3 +1,4 @@
 SOURCES += foo.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
index fa56972dd2348b5e3336db0e90e00ed4977e634a..9c06a2010187972fd4fd006230d5101b238166c6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro
@@ -1,3 +1,4 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
index 759bea0682663f536cacb06bdfa8b4170d0d47ef..7a7ad5ee761151b85c710ceb6872b33c40619c1c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro
@@ -1,3 +1,4 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
index 63f5d66e24af201676c3c125a826fbcba241c1e6..6667df7f40cc6edb58365ac5d788620f28e74e7d 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro
@@ -1,3 +1,4 @@
 SOURCES += finddialog.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
index 63f5d66e24af201676c3c125a826fbcba241c1e6..6667df7f40cc6edb58365ac5d788620f28e74e7d 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro
@@ -1,3 +1,4 @@
 SOURCES += finddialog.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
index 63f5d66e24af201676c3c125a826fbcba241c1e6..6667df7f40cc6edb58365ac5d788620f28e74e7d 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro
@@ -1,3 +1,4 @@
 SOURCES += finddialog.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
index fa56972dd2348b5e3336db0e90e00ed4977e634a..9c06a2010187972fd4fd006230d5101b238166c6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro
@@ -1,3 +1,4 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
index fa56972dd2348b5e3336db0e90e00ed4977e634a..9c06a2010187972fd4fd006230d5101b238166c6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro
@@ -1,3 +1,4 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
index bbabdfba2877ca0d14d3ca7291ee51bb56515956..37df00f4098f18cd9cd92f8199def87d19ab90f4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro
@@ -2,3 +2,4 @@ SOURCES += main.cpp
 SOURCES += finddialog.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
index c96859bdb0081eace0136fef475848f1dde02c49..289727904c98cac86597e08ae3cc5e428ce685b3 100644
--- a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
index c96859bdb0081eace0136fef475848f1dde02c49..289727904c98cac86597e08ae3cc5e428ce685b3 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
index 759bea0682663f536cacb06bdfa8b4170d0d47ef..7a7ad5ee761151b85c710ceb6872b33c40619c1c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro
@@ -1,3 +1,4 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
index bbabdfba2877ca0d14d3ca7291ee51bb56515956..37df00f4098f18cd9cd92f8199def87d19ab90f4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro
@@ -2,3 +2,4 @@ SOURCES += main.cpp
 SOURCES += finddialog.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
index 759bea0682663f536cacb06bdfa8b4170d0d47ef..7a7ad5ee761151b85c710ceb6872b33c40619c1c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro
@@ -1,3 +1,4 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
index 657b535e2779ee7184dfe45b1949747b6faa2644..3ddaa67372ddcbe550aa059b9dea5bd47cf00816 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.java
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro
index d549039c4b8d8dbbb2631bfed45a4ca8a9451155..7d69cb43d7dce4f9b792486a59e86da67a8d84d6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro
index d549039c4b8d8dbbb2631bfed45a4ca8a9451155..7d69cb43d7dce4f9b792486a59e86da67a8d84d6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro
index d549039c4b8d8dbbb2631bfed45a4ca8a9451155..7d69cb43d7dce4f9b792486a59e86da67a8d84d6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro
index d549039c4b8d8dbbb2631bfed45a4ca8a9451155..7d69cb43d7dce4f9b792486a59e86da67a8d84d6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro b/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro
index d549039c4b8d8dbbb2631bfed45a4ca8a9451155..7d69cb43d7dce4f9b792486a59e86da67a8d84d6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.js
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro
index 1040e2227686d04ba04ad1312478f162747c2fc7..cc6397936adc8b332cfcc53b92ad1ce913a90489 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.qml
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro b/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro
index 1040e2227686d04ba04ad1312478f162747c2fc7..cc6397936adc8b332cfcc53b92ad1ce913a90489 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.qml
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro b/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
index fa56972dd2348b5e3336db0e90e00ed4977e634a..9c06a2010187972fd4fd006230d5101b238166c6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro
@@ -1,3 +1,4 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro b/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
index 759bea0682663f536cacb06bdfa8b4170d0d47ef..7a7ad5ee761151b85c710ceb6872b33c40619c1c 100644
--- a/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro
@@ -1,3 +1,4 @@
 SOURCES = main.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
index c96859bdb0081eace0136fef475848f1dde02c49..289727904c98cac86597e08ae3cc5e428ce685b3 100644
--- a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
index 0e920f99d62ab3abe5d52e35300e94951facfb15..b6d226666be9d2875360bef72b70f4ab1e8869fe 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro
@@ -29,3 +29,4 @@ if (exists($$member($$(PATH), 0))) {
 }
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
index 3dc4208587b3114c4caf084c896f24a35883a2d2..4553e59121b79163a140cbf96316124f60282e64 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro
@@ -31,3 +31,4 @@ win32: SOURCES += $$system(type files-cc.txt)
 unix: SOURCES += $$system(cat files-cc.txt)
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
index 6bfe751f4bb2e9e8ec43d0bf11c0e36bf4fcf543..5401eaa7a3e5e9ba473165390ffa5cb82e683823 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro
@@ -3,3 +3,4 @@ SOURCES += file*.cpp filter.cpp non-existing.cpp
 include(sub/sub.pri)
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
index 5e23538b9500326ae0877976f92f3a17283ee9cf..659f27292edeedd2ab5e54c8973051879efe8a51 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro
@@ -7,3 +7,4 @@ include(relativity/relativity.pri)
 message($$SOURCES)
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
index df18c5a6949c5362f10ab76e1b2e00a3b519fc94..334a26b9270c7bb332ec372eb1d729335b98882b 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro
@@ -1,3 +1,4 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = ../project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro
index 3f6c64360ba8a5bc062915bc278d18c1f6fe8019..ec5cb04cd7adc283fcdbf994a039c3c392671953 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro
@@ -1,2 +1,3 @@
 SOURCES += main.cpp
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro
index a1863b665db64ab67e9d935c8d6f081a08fe34fb..ba05b4b013756d97aad080d4bfd2d3e23fdb37a2 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro
@@ -1 +1,2 @@
 SOURCES += main_mac.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro
index 71b1a22521876a6363835bc4b73b9e32109ae01b..79594260b17c937a9358e701c6adf3e162feb736 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro
@@ -1 +1,2 @@
 SOURCES += main_unix.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro
index afd7197117fc2b76d991a8973da9411d003d5506..05b1742e7b21cd91b2cc47756b2568fe5d2967d6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro
@@ -1 +1,2 @@
 SOURCES += main_win.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro b/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
index 4e2e6ada78887862870f4068868a9ba589741167..f80b1d4c9c9846d65b8d287e0e7653d22f6824e4 100644
--- a/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro
@@ -1,3 +1,4 @@
 SOURCES += main.cpp
 
 TRANSLATIONS = translations/project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
index fa56972dd2348b5e3336db0e90e00ed4977e634a..9c06a2010187972fd4fd006230d5101b238166c6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro
@@ -1,3 +1,4 @@
 FORMS += project.ui
 
 TRANSLATIONS = project.ts
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro
index 28dcadcbfa2216f6d750bb0697a33b431ee8e9fa..55e50d275bf9190c7d4f49b2c26a85c31725c375 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro
@@ -1 +1,2 @@
 SOURCES += main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/subsub1.pro b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/subsub1.pro
index 28dcadcbfa2216f6d750bb0697a33b431ee8e9fa..55e50d275bf9190c7d4f49b2c26a85c31725c375 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/subsub1.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/subsub1.pro
@@ -1 +1,2 @@
 SOURCES += main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro
index 34992228702d4edf8d7d5361076e0a0e529b20fa..afbcd9cf71496ccb54dd98303d232e76b4642e81 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro
@@ -2,3 +2,4 @@ SOURCES += main.cpp
 
 TRANSLATIONS = ../../project_sub.ts
 CODECFORTR = ISO-8859-2
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro
index 28dcadcbfa2216f6d750bb0697a33b431ee8e9fa..55e50d275bf9190c7d4f49b2c26a85c31725c375 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro
@@ -1 +1,2 @@
 SOURCES += main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/subsub1.pro b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/subsub1.pro
index 28dcadcbfa2216f6d750bb0697a33b431ee8e9fa..55e50d275bf9190c7d4f49b2c26a85c31725c375 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/subsub1.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/subsub1.pro
@@ -1 +1,2 @@
 SOURCES += main.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro
index 34992228702d4edf8d7d5361076e0a0e529b20fa..afbcd9cf71496ccb54dd98303d232e76b4642e81 100644
--- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro
+++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro
@@ -2,3 +2,4 @@ SOURCES += main.cpp
 
 TRANSLATIONS = ../../project_sub.ts
 CODECFORTR = ISO-8859-2
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
index 4f7a21166646031537d0e35c31b71d093f8565db..71f02894109e34783d6c93a2a268cc096e6fd0a0 100644
--- a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
+++ b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
@@ -19,3 +19,4 @@ wince*: {
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qhelpenginecore/qhelpenginecore.pro b/tests/auto/qhelpenginecore/qhelpenginecore.pro
index 5f84a8830bb6efd799d6ecab3673f0946be96e8a..744cafa6cf96862187c05b88141c42e7c96c1cd9 100644
--- a/tests/auto/qhelpenginecore/qhelpenginecore.pro
+++ b/tests/auto/qhelpenginecore/qhelpenginecore.pro
@@ -20,3 +20,4 @@ wince*: {
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro
index c6fb2d3ea65fd5e9369f2c122655f53b600b2fa3..54ba2f09a7ecb2733cee6ce0cfa4a24c0880ab76 100644
--- a/tests/auto/qhelpgenerator/qhelpgenerator.pro
+++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro
@@ -6,3 +6,4 @@ QT      += help sql testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
index 18c118f2da73680e1795f0bf4e842536fa0a41b7..261afc81d5aa67f286e216720ffa92f991af616c 100644
--- a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
+++ b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
@@ -6,3 +6,4 @@ QT      += help sql testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
index 3922e20ecf45b093c4e13fa3b0fe91258fdbd1b0..18f8c83698b64978e5ffe655be926d0f318d2db3 100644
--- a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
+++ b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
@@ -7,3 +7,4 @@ QT      += help testlib
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE
 
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/uiloader/uiloader/uiloader.pro b/tests/auto/uiloader/uiloader/uiloader.pro
index 0145a8df446ed372f1282ddcca71e9e1041e5697..1811c4080745e4bf2fd1b9796ac266b6770161ec 100644
--- a/tests/auto/uiloader/uiloader/uiloader.pro
+++ b/tests/auto/uiloader/uiloader/uiloader.pro
@@ -16,3 +16,4 @@ win32 {
 
 HEADERS += uiloader.h
 SOURCES += tst_uiloader.cpp uiloader.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0