diff options
Diffstat (limited to 'tests/auto/tools/qmake/testdata')
29 files changed, 3 insertions, 58 deletions
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 69bd9f2677..e4f81e6e1e 100644 --- a/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro +++ b/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro @@ -5,4 +5,3 @@ 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 c6a13e8a88..510ab95ab3 100644 --- a/tests/auto/tools/qmake/testdata/comments/comments.pro +++ b/tests/auto/tools/qmake/testdata/comments/comments.pro @@ -29,6 +29,3 @@ LIST = 1 2 3 4$${LITERAL_HASH}five !equals( LIST, 1 2 3 4$${LITERAL_HASH}five ) { message( "FAILED: using LITERAL_HASH" ) } - - -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 9e1f9f6195..b7c2f6dae3 100644 --- a/tests/auto/tools/qmake/testdata/duplicateLibraryEntries/duplib.pro +++ b/tests/auto/tools/qmake/testdata/duplicateLibraryEntries/duplib.pro @@ -5,7 +5,3 @@ JOINEDLIBS = $$join(LIBS, "_") !contains(JOINEDLIBS, -lqui_-lqtest_-lqui) { message("FAILED: duplibs") } - - - -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 a0904bc4c2..f21173783a 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 @@ -12,7 +12,3 @@ O_BAR=$$fromfile(oink.pri,BAR) !equals(O_FOO,bar) { message( "FAILED: export() invisible from default_pre.prf through \$$fromfile()" ) } - - - -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 189da9fc59..442c9c767f 100644 --- a/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro +++ b/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro @@ -10,4 +10,3 @@ 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 3b7568d928..a4a7dc987d 100644 --- a/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro +++ b/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro @@ -2,4 +2,3 @@ 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 bf328dc4fc..fc3818985b 100644 --- a/tests/auto/tools/qmake/testdata/func_export/func_export.pro +++ b/tests/auto/tools/qmake/testdata/func_export/func_export.pro @@ -17,7 +17,3 @@ callDoExport() !isEqual(EXPORTED, "foo bar baz") { message( "FAILED: global-scope exports [$$EXPORTED] != foo bar baz" ) } - - - -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 1f4d8314bc..cc13437f4a 100644 --- a/tests/auto/tools/qmake/testdata/func_variables/func_variables.pro +++ b/tests/auto/tools/qmake/testdata/func_variables/func_variables.pro @@ -47,7 +47,3 @@ callTest($$value) !isEqual(RESULT,$$value) { message( "FAILED: result [$$RESULT] != $$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 bf1344eb68..84f97c2022 100644 --- a/tests/auto/tools/qmake/testdata/functions/functions.pro +++ b/tests/auto/tools/qmake/testdata/functions/functions.pro @@ -171,4 +171,5 @@ else: \ testReplace($$shell_quote($$in), $$out, "shell_quote") testReplace($$reverse($$list(one two three)), three two one, "reverse") -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +testReplace($$cat(textfile), hi '"holla he"' 'hu!') diff --git a/tests/auto/tools/qmake/testdata/functions/infiletest.pro b/tests/auto/tools/qmake/testdata/functions/infiletest.pro index 7dca60191e..821cb5cb2c 100644 --- a/tests/auto/tools/qmake/testdata/functions/infiletest.pro +++ b/tests/auto/tools/qmake/testdata/functions/infiletest.pro @@ -1,3 +1 @@ DEFINES = QT_DLL - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/tools/qmake/testdata/functions/textfile b/tests/auto/tools/qmake/testdata/functions/textfile new file mode 100644 index 0000000000..a8248ed6f8 --- /dev/null +++ b/tests/auto/tools/qmake/testdata/functions/textfile @@ -0,0 +1 @@ +hi "holla he" hu! diff --git a/tests/auto/tools/qmake/testdata/include_dir/foo.pro b/tests/auto/tools/qmake/testdata/include_dir/foo.pro index a7949ad88f..e7fc2d4dbf 100644 --- a/tests/auto/tools/qmake/testdata/include_dir/foo.pro +++ b/tests/auto/tools/qmake/testdata/include_dir/foo.pro @@ -9,5 +9,3 @@ SOURCES=\ main.cpp 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 737802370a..424062a9ac 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,4 +5,3 @@ 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 0436d8406d..0b59981240 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,4 +1,3 @@ # 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 f013ae1a85..542b9ff516 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,4 +1,3 @@ # 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 d6d424671a..22180d3429 100644 --- a/tests/auto/tools/qmake/testdata/install_depends/foo.pro +++ b/tests/auto/tools/qmake/testdata/install_depends/foo.pro @@ -18,7 +18,3 @@ INSTALLS+=test2 target.path=dist target.depends=install_test1 install_test2 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 5f48aef119..b18f47d20b 100644 --- a/tests/auto/tools/qmake/testdata/one_space/one_space.pro +++ b/tests/auto/tools/qmake/testdata/one_space/one_space.pro @@ -2,4 +2,3 @@ TEMPLATE = app 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 7d906f58f7..463fa73d81 100644 --- a/tests/auto/tools/qmake/testdata/operators/operators.pro +++ b/tests/auto/tools/qmake/testdata/operators/operators.pro @@ -21,5 +21,3 @@ VAR ~= s/QT_+/Q_ !contains( VAR, Q_DLL ) { 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 31c3c05dfb..548e8d1379 100644 --- a/tests/auto/tools/qmake/testdata/prompt/prompt.pro +++ b/tests/auto/tools/qmake/testdata/prompt/prompt.pro @@ -1,3 +1 @@ # 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 139c4153f5..61d6f38696 100644 --- a/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro +++ b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro @@ -18,7 +18,3 @@ rcc_test.depends = $$QMAKE_RCC QMAKE_EXTRA_COMPILERS += rcc_test 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 97a5410b25..3026f3ff99 100644 --- a/tests/auto/tools/qmake/testdata/shadow_files/foo.pro +++ b/tests/auto/tools/qmake/testdata/shadow_files/foo.pro @@ -12,7 +12,3 @@ INSTALLS+=target test.files=test.txt foo.bar test.path=dist 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 3d30e25b68..c57a1c877c 100644 --- a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro +++ b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro @@ -5,4 +5,3 @@ 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 4b7b3f31ce..f589d2b3d4 100644 --- a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro +++ b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro @@ -12,4 +12,3 @@ 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 c04ed05ff3..9abc3e9f26 100644 --- a/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro +++ b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro @@ -11,5 +11,3 @@ MOC_DIR = tmp 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 c5b9fdd7dc..2db08a29af 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,4 +3,3 @@ 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 db1d57b502..d63f1d4362 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 @@ -4,4 +4,3 @@ 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 4b7b3f31ce..f589d2b3d4 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,4 +12,3 @@ 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 69e1f676ac..8c003275a2 100644 --- a/tests/auto/tools/qmake/testdata/substitutes/test.pro +++ b/tests/auto/tools/qmake/testdata/substitutes/test.pro @@ -6,4 +6,3 @@ 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 463aed53f6..e4b9eaa884 100644 --- a/tests/auto/tools/qmake/testdata/variables/variables.pro +++ b/tests/auto/tools/qmake/testdata/variables/variables.pro @@ -10,6 +10,3 @@ JOINEDNEWVAR = $$join( NEWVAR, "-" ) !contains( JOINEDNEWVAR, 5-4-3 ) { message( "FAILED: member [$$JOINEDNEWVAR != 5-4-3]" ) } - - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |