From 0bd7609162fe4740124847a69eeceb83b42491b8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 1 Aug 2012 17:14:06 +0200 Subject: [PATCH] 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: I73b99cd8e948dbebcdac30c4e5f2772eacb958ab Reviewed-by: Jason McDonald --- src/linguist/linguist/phraseview.cpp | 2 +- tests/auto/headersclean/headersclean.pro | 1 + tests/auto/linguist/lconvert/lconvert.pro | 1 + tests/auto/linguist/lrelease/lrelease.pro | 1 + tests/auto/linguist/lupdate/lupdate.pro | 1 + tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/codecfortr/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/codecfortr1/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/codecfortr2/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/codecfortr3/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/codecfortr4/project.pro | 1 + .../lupdate/testdata/good/from_subdir/translations/translations.pro | 1 + tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro | 1 + .../auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro | 1 + .../auto/linguist/lupdate/testdata/good/multiple_locations/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro | 1 + .../auto/linguist/lupdate/testdata/good/parse_special_chars/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/parseui/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/prefix/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro | 1 + .../auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro | 1 + .../linguist/lupdate/testdata/good/proparsingsubs/common/common.pro | 1 + tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro | 1 + tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro | 1 + tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro | 1 + tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro | 1 + tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro | 1 + tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro | 1 + .../linguist/lupdate/testdata/subdirs_full/subdir2/subsub1/subsub1.pro | 1 + .../linguist/lupdate/testdata/subdirs_full/subdir2/subsub2/subsub2.pro | 1 + tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro | 1 + .../linguist/lupdate/testdata/subdirs_part/subdir2/subsub1/subsub1.pro | 1 + .../linguist/lupdate/testdata/subdirs_part/subdir2/subsub2/subsub2.pro | 1 + tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro | 1 + tests/auto/qhelpenginecore/qhelpenginecore.pro | 1 + tests/auto/qhelpgenerator/qhelpgenerator.pro | 1 + tests/auto/qhelpindexmodel/qhelpindexmodel.pro | 1 + tests/auto/qhelpprojectdata/qhelpprojectdata.pro | 1 + tests/auto/uiloader/uiloader/uiloader.pro | 1 + 63 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/linguist/linguist/phraseview.cpp b/src/linguist/linguist/phraseview.cpp index 85c703c..aabcc68 100644 --- a/src/linguist/linguist/phraseview.cpp +++ b/src/linguist/linguist/phraseview.cpp @@ -86,7 +86,7 @@ PhraseView::PhraseView(MultiDataModel *model, QListsetResizeMode(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 df49c6f..7a17970 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 af29c58..f1761e6 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 ba69b7f..7da0e42 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 7c38566..f2beceb 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 d4dcda8..5761863 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 7225608..f133c60 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 64f3c85..884fc52 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 d5697eb..6d21e0d 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 c95939c..8918087 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 00a4dc4..1a2f50e 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 4fddb02..2d08a07 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 1815c37..1997e03 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 759bea0..7a7ad5e 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 759bea0..7a7ad5e 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 6149858..b7a9f77 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 fa56972..9c06a20 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 759bea0..7a7ad5e 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 63f5d66..6667df7 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 63f5d66..6667df7 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 63f5d66..6667df7 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 fa56972..9c06a20 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 fa56972..9c06a20 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 bbabdfb..37df00f 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 c96859b..2897279 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 c96859b..2897279 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 759bea0..7a7ad5e 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 bbabdfb..37df00f 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 759bea0..7a7ad5e 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 657b535..3ddaa67 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 d549039..7d69cb4 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 d549039..7d69cb4 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 d549039..7d69cb4 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 d549039..7d69cb4 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 d549039..7d69cb4 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 1040e22..cc63979 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 1040e22..cc63979 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 fa56972..9c06a20 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 759bea0..7a7ad5e 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 c96859b..2897279 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 0e920f9..b6d2266 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 3dc4208..4553e59 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 6bfe751..5401eaa 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 5e23538..659f272 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 df18c5a..334a26b 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 3f6c643..ec5cb04 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 a1863b6..ba05b4b 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 71b1a22..7959426 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 afd7197..05b1742 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 4e2e6ad..f80b1d4 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 fa56972..9c06a20 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 28dcadc..55e50d2 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 28dcadc..55e50d2 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 3499222..afbcd9c 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 28dcadc..55e50d2 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 28dcadc..55e50d2 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 3499222..afbcd9c 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 4f7a211..71f0289 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 5f84a88..744cafa 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 c6fb2d3..54ba2f0 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 18c118f..261afc8 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 3922e20..18f8c83 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 0145a8d..1811c40 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 -- 2.7.4