From 082cfac15accc6b269b4e545844e992f6acbc231 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 7 Aug 2013 13:26:15 +0200 Subject: [PATCH] purge pointless QT_DISABLE_DEPRECATED_BEFORE=0 neither the tool test code nor the lupdate test data need any of it. Change-Id: I7604596f17308f7d49850f683b8ab84a0bc88131 Reviewed-by: Oswald Buddenhagen --- tests/auto/linguist/lconvert/lconvert.pro | 2 -- tests/auto/linguist/lupdate/lupdate.pro | 2 -- tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro | 1 - tests/auto/linguist/lupdate/testdata/good/codecforsrc/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 | 2 -- 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/qhelpgenerator/qhelpgenerator.pro | 1 - 50 files changed, 53 deletions(-) diff --git a/tests/auto/linguist/lconvert/lconvert.pro b/tests/auto/linguist/lconvert/lconvert.pro index f1761e6..60e674a 100644 --- a/tests/auto/linguist/lconvert/lconvert.pro +++ b/tests/auto/linguist/lconvert/lconvert.pro @@ -6,5 +6,3 @@ TARGET = tst_lconvert #HEADERS += testlupdate.h SOURCES += tst_lconvert.cpp # testlupdate.cpp - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/linguist/lupdate/lupdate.pro b/tests/auto/linguist/lupdate/lupdate.pro index 35339ef..cf2b854 100644 --- a/tests/auto/linguist/lupdate/lupdate.pro +++ b/tests/auto/linguist/lupdate/lupdate.pro @@ -4,5 +4,3 @@ QT += testlib 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 5761863..d4dcda8 100644 --- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro @@ -1,4 +1,3 @@ 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 3779ef0..489e060 100644 --- a/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/codecforsrc/project.pro @@ -4,4 +4,3 @@ CONFIG+= console TRANSLATIONS = project.ts CODECFORSRC = utf-8 -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 1997e03..1815c37 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,4 +5,3 @@ 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 7a7ad5e..759bea0 100644 --- a/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/heuristics/project.pro @@ -1,4 +1,3 @@ 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 7a7ad5e..759bea0 100644 --- a/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/lacksqobject/project.pro @@ -1,4 +1,3 @@ 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 b7a9f77..6149858 100644 --- a/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/merge_ordering/project.pro @@ -1,4 +1,3 @@ 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 9c06a20..fa56972 100644 --- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.pro @@ -1,4 +1,3 @@ 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 7a7ad5e..759bea0 100644 --- a/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/merge_whitespace/project.pro @@ -1,4 +1,3 @@ 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 6667df7..63f5d66 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp/project.pro @@ -1,4 +1,3 @@ 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 6667df7..63f5d66 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.pro @@ -1,4 +1,3 @@ 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 6667df7..63f5d66 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.pro @@ -1,4 +1,3 @@ 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 9c06a20..fa56972 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.pro @@ -1,4 +1,3 @@ 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 9c06a20..fa56972 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/mergeui_obsolete/project.pro @@ -1,4 +1,3 @@ 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 37df00f..bbabdfb 100644 --- a/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.pro @@ -2,4 +2,3 @@ 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 2897279..c96859b 100644 --- a/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/namespaces/project.pro @@ -1,4 +1,3 @@ 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 2897279..c96859b 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,4 +1,3 @@ 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 7a7ad5e..759bea0 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsecontexts/project.pro @@ -1,4 +1,3 @@ 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 d0dd914..ac5c284 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.pro @@ -5,4 +5,3 @@ SOURCES += excluded.cpp TR_EXCLUDE = $$PWD/excluded.* 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 7a7ad5e..759bea0 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/project.pro @@ -1,4 +1,3 @@ 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 3ddaa67..657b535 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsejava/project.pro @@ -1,4 +1,3 @@ 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 7d69cb4..d549039 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs/project.pro @@ -1,4 +1,3 @@ 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 7d69cb4..d549039 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs2/project.pro @@ -1,4 +1,3 @@ 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 7d69cb4..d549039 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs3/project.pro @@ -1,4 +1,3 @@ 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 7d69cb4..d549039 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsejs4/project.pro @@ -1,4 +1,3 @@ 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 7d69cb4..d549039 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro @@ -1,4 +1,3 @@ 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 cc63979..1040e22 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.pro @@ -1,4 +1,3 @@ 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 cc63979..1040e22 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parseqml2/project.pro @@ -1,4 +1,3 @@ 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 9c06a20..fa56972 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/parseui/project.pro @@ -1,4 +1,3 @@ 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 7a7ad5e..759bea0 100644 --- a/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/prefix/project.pro @@ -1,4 +1,3 @@ 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 2897279..c96859b 100644 --- a/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/preprocess/project.pro @@ -1,4 +1,3 @@ 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 a3d1138..a63c4e3 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsing/project.pro @@ -29,4 +29,3 @@ 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 4553e59..3dc4208 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsing2/project.pro @@ -31,4 +31,3 @@ 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 5401eaa..6bfe751 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpaths/project.pro @@ -3,4 +3,3 @@ 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 659f272..5e23538 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingpri/project.pro @@ -7,4 +7,3 @@ 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 334a26b..df18c5a 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubdirs/sub1/sub1.pro @@ -1,4 +1,3 @@ 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 ec5cb04..28dcadc 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/common/common.pro @@ -1,3 +1 @@ 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 ba05b4b..a1863b6 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/mac/mac.pro @@ -1,2 +1 @@ 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 7959426..71b1a22 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/unix/unix.pro @@ -1,2 +1 @@ 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 05b1742..afd7197 100644 --- a/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro +++ b/tests/auto/linguist/lupdate/testdata/good/proparsingsubs/win/win.pro @@ -1,2 +1 @@ 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 f80b1d4..4e2e6ad 100644 --- a/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/reloutput/project.pro @@ -1,4 +1,3 @@ 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 9c06a20..fa56972 100644 --- a/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro +++ b/tests/auto/linguist/lupdate/testdata/good/textsimilarity/project.pro @@ -1,4 +1,3 @@ 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 55e50d2..28dcadc 100644 --- a/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro +++ b/tests/auto/linguist/lupdate/testdata/subdirs_full/subdir1/subdir1.pro @@ -1,2 +1 @@ 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 55e50d2..28dcadc 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,2 +1 @@ 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 26a954a..ac52577 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 @@ -1,4 +1,3 @@ SOURCES += main.cpp TRANSLATIONS = ../../project_sub.ts -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 55e50d2..28dcadc 100644 --- a/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro +++ b/tests/auto/linguist/lupdate/testdata/subdirs_part/subdir1/subdir1.pro @@ -1,2 +1 @@ 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 55e50d2..28dcadc 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,2 +1 @@ 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 26a954a..ac52577 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 @@ -1,4 +1,3 @@ SOURCES += main.cpp TRANSLATIONS = ../../project_sub.ts -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro index 29b6ba4..9134f53 100644 --- a/tests/auto/qhelpgenerator/qhelpgenerator.pro +++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro @@ -6,4 +6,3 @@ QT += help-private sql testlib DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += QT_USE_USING_NAMESPACE -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- 2.7.4