diff options
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication/test')
3 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt index 40e612f0de..7f92e1cee8 100644 --- a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt @@ -29,14 +29,14 @@ extend_target(test CONDITION builtin_testdata BUILTIN_TESTDATA ) -#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID: # SUBPROGRAMS = "desktopsettingsaware" "modal" -#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../debug/helper" -#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../release/helper" -#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../helper" diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt index 171ee1b273..304480f509 100644 --- a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt @@ -30,14 +30,14 @@ extend_target(tst_qapplication CONDITION builtin_testdata # special case BUILTIN_TESTDATA ) -#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 3:.:.:test.pro:NOT ANDROID: # SUBPROGRAMS = "desktopsettingsaware" "modal" -#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 6:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../debug/helper" -#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 8:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../release/helper" -#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID AND NOT WINRT: +#### Keys ignored in scope 10:.:.:test.pro:NOT ANDROID: # TEST_HELPER_INSTALLS = "../helper" diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro index 8ade4d8364..39b099261a 100644 --- a/tests/auto/widgets/kernel/qapplication/test/test.pro +++ b/tests/auto/widgets/kernel/qapplication/test/test.pro @@ -9,20 +9,20 @@ builtin_testdata: DEFINES += BUILTIN_TESTDATA TESTDATA = ../test/test.pro ../tmp/README ../modal -!android:!winrt: SUBPROGRAMS = desktopsettingsaware modal +!android: SUBPROGRAMS = desktopsettingsaware modal debug_and_release { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qapplication - !android:!winrt: TEST_HELPER_INSTALLS = ../debug/helper + !android: TEST_HELPER_INSTALLS = ../debug/helper for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../debug/$${file}" } else { TARGET = ../../release/tst_qapplication - !android:!winrt: TEST_HELPER_INSTALLS = ../release/helper + !android: TEST_HELPER_INSTALLS = ../release/helper for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../release/$${file}" } } else { TARGET = ../tst_qapplication - !android:!winrt: TEST_HELPER_INSTALLS = ../helper + !android: TEST_HELPER_INSTALLS = ../helper for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}" } |