diff options
Diffstat (limited to 'tests/auto')
23 files changed, 34 insertions, 34 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 64996503eb..480f986830 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -31,7 +31,7 @@ endif() # special case begin # Build only corelib and gui tests when targeting uikit (iOS), # because the script can't handle the SUBDIRS assignment well. -if (APPLE_UIKIT) +if (UIKIT) return() endif() # special case end diff --git a/tests/auto/corelib/.prev_CMakeLists.txt b/tests/auto/corelib/.prev_CMakeLists.txt index 1029b14654..2019a771c0 100644 --- a/tests/auto/corelib/.prev_CMakeLists.txt +++ b/tests/auto/corelib/.prev_CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from corelib.pro. add_subdirectory(kernel) -if(NOT APPLE_UIKIT) +if(NOT UIKIT) add_subdirectory(animation) add_subdirectory(codecs) add_subdirectory(global) diff --git a/tests/auto/corelib/CMakeLists.txt b/tests/auto/corelib/CMakeLists.txt index 1029b14654..2019a771c0 100644 --- a/tests/auto/corelib/CMakeLists.txt +++ b/tests/auto/corelib/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from corelib.pro. add_subdirectory(kernel) -if(NOT APPLE_UIKIT) +if(NOT UIKIT) add_subdirectory(animation) add_subdirectory(codecs) add_subdirectory(global) diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt index 84136283c1..f77185bc2b 100644 --- a/tests/auto/corelib/io/qdir/CMakeLists.txt +++ b/tests/auto/corelib/io/qdir/CMakeLists.txt @@ -37,7 +37,7 @@ add_qt_resource(tst_qdir "qdir" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:qdir.pro:APPLE_IOS: +#### Keys ignored in scope 2:.:.:qdir.pro:IOS: # QMAKE_INFO_PLIST = "Info.plist" extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata diff --git a/tests/auto/corelib/kernel/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/.prev_CMakeLists.txt index 5415a23a98..515720e282 100644 --- a/tests/auto/corelib/kernel/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/.prev_CMakeLists.txt @@ -17,11 +17,11 @@ add_subdirectory(qmetaenum) if(TARGET Qt::Gui) add_subdirectory(qmimedata) endif() -if(TARGET Qt::Network AND NOT ANDROID AND NOT APPLE_UIKIT) +if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT) add_subdirectory(qobject) endif() add_subdirectory(qpointer) -if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT APPLE_UIKIT) +if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT UIKIT) add_subdirectory(qsharedmemory) endif() add_subdirectory(qsignalblocker) @@ -29,7 +29,7 @@ add_subdirectory(qsignalmapper) if(QT_FEATURE_private_tests AND TARGET Qt::Network) add_subdirectory(qsocketnotifier) endif() -if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT APPLE_UIKIT) +if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT UIKIT) add_subdirectory(qsystemsemaphore) endif() add_subdirectory(qtimer) diff --git a/tests/auto/corelib/kernel/CMakeLists.txt b/tests/auto/corelib/kernel/CMakeLists.txt index 9fbe2b8b7a..c72018db6c 100644 --- a/tests/auto/corelib/kernel/CMakeLists.txt +++ b/tests/auto/corelib/kernel/CMakeLists.txt @@ -17,11 +17,11 @@ add_subdirectory(qmetaenum) if(TARGET Qt::Gui) add_subdirectory(qmimedata) endif() -if(TARGET Qt::Network AND NOT ANDROID AND NOT APPLE_UIKIT) +if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT) # add_subdirectory(qobject) # special case endif() add_subdirectory(qpointer) -if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT APPLE_UIKIT) +if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT UIKIT) add_subdirectory(qsharedmemory) endif() add_subdirectory(qsignalblocker) @@ -29,7 +29,7 @@ add_subdirectory(qsignalmapper) if(QT_FEATURE_private_tests AND TARGET Qt::Network) add_subdirectory(qsocketnotifier) endif() -if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT APPLE_UIKIT) +if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT UIKIT) add_subdirectory(qsystemsemaphore) endif() # add_subdirectory(qtimer) # special case diff --git a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt index bdee0f0f6c..a051bb3ea6 100644 --- a/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt @@ -7,6 +7,6 @@ add_subdirectory(tst) if(UNIX AND NOT ANDROID AND NOT APPLE) add_subdirectory(almostplugin) endif() -if(APPLE_MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui) +if(MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui) add_subdirectory(machtest) endif() diff --git a/tests/auto/gui/.prev_CMakeLists.txt b/tests/auto/gui/.prev_CMakeLists.txt index 8cbfa78aad..e7317e932c 100644 --- a/tests/auto/gui/.prev_CMakeLists.txt +++ b/tests/auto/gui/.prev_CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from gui.pro. add_subdirectory(kernel) -if(NOT APPLE_UIKIT) +if(NOT UIKIT) add_subdirectory(image) add_subdirectory(math3d) add_subdirectory(painting) @@ -10,10 +10,10 @@ if(NOT APPLE_UIKIT) add_subdirectory(itemmodels) add_subdirectory(rhi) endif() -if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT) +if(QT_FEATURE_opengl AND NOT UIKIT AND NOT WINRT) add_subdirectory(qopenglconfig) add_subdirectory(qopengl) endif() -if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT) +if(QT_FEATURE_vulkan AND NOT UIKIT) add_subdirectory(qvulkan) endif() diff --git a/tests/auto/gui/CMakeLists.txt b/tests/auto/gui/CMakeLists.txt index 9a1312bd48..e9c9ffe9fe 100644 --- a/tests/auto/gui/CMakeLists.txt +++ b/tests/auto/gui/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from gui.pro. add_subdirectory(kernel) -if(NOT APPLE_UIKIT) +if(NOT UIKIT) add_subdirectory(image) add_subdirectory(math3d) add_subdirectory(painting) @@ -10,10 +10,10 @@ if(NOT APPLE_UIKIT) add_subdirectory(itemmodels) add_subdirectory(rhi) endif() -if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT) +if(QT_FEATURE_opengl AND NOT UIKIT AND NOT WINRT) add_subdirectory(qopenglconfig) add_subdirectory(qopengl) endif() -if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT) +if(QT_FEATURE_vulkan AND NOT UIKIT) add_subdirectory(qvulkan) endif() diff --git a/tests/auto/gui/kernel/CMakeLists.txt b/tests/auto/gui/kernel/CMakeLists.txt index b2397bed19..ecac48d1c1 100644 --- a/tests/auto/gui/kernel/CMakeLists.txt +++ b/tests/auto/gui/kernel/CMakeLists.txt @@ -20,7 +20,7 @@ add_subdirectory(qwindow) add_subdirectory(qguiapplication) add_subdirectory(qpixelformat) add_subdirectory(qrasterwindow) -if(NOT ANDROID AND NOT APPLE_UIKIT) +if(NOT ANDROID AND NOT UIKIT) add_subdirectory(qclipboard) endif() if(TARGET Qt::Network) diff --git a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt index d75f39da58..36d9f7b00c 100644 --- a/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt @@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard ## Scopes: ##################################################################### -extend_target(tst_qclipboard CONDITION APPLE_MACOS +extend_target(tst_qclipboard CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt index d75f39da58..36d9f7b00c 100644 --- a/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt @@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard ## Scopes: ##################################################################### -extend_target(tst_qclipboard CONDITION APPLE_MACOS +extend_target(tst_qclipboard CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/network/kernel/CMakeLists.txt b/tests/auto/network/kernel/CMakeLists.txt index 49270d11cb..6ce3fcdf32 100644 --- a/tests/auto/network/kernel/CMakeLists.txt +++ b/tests/auto/network/kernel/CMakeLists.txt @@ -13,7 +13,7 @@ endif() if(QT_FEATURE_private_tests) add_subdirectory(qauthenticator) - if(NOT APPLE_MACOS) + if(NOT MACOS) add_subdirectory(qhostinfo) endif() endif() diff --git a/tests/auto/other/CMakeLists.txt b/tests/auto/other/CMakeLists.txt index 2ce438985f..88a29b479b 100644 --- a/tests/auto/other/CMakeLists.txt +++ b/tests/auto/other/CMakeLists.txt @@ -15,7 +15,7 @@ if(TARGET Qt::Network AND TARGET Qt::Widgets AND NOT WINRT) add_subdirectory(lancelot) add_subdirectory(qnetworkaccessmanager_and_qprogressdialog) endif() -if(APPLE_MACOS AND TARGET Qt::Gui AND TARGET Qt::Widgets) +if(MACOS AND TARGET Qt::Gui AND TARGET Qt::Widgets) add_subdirectory(macgui) add_subdirectory(macplist) add_subdirectory(qaccessibilitymac) @@ -35,7 +35,7 @@ endif() if(TARGET Qt::Network AND NOT WINRT) add_subdirectory(networkselftest) endif() -if(APPLE_MACOS AND TARGET Qt::Gui) +if(MACOS AND TARGET Qt::Gui) add_subdirectory(macnativeevents) endif() if(embedded) diff --git a/tests/auto/other/macgui/.prev_CMakeLists.txt b/tests/auto/other/macgui/.prev_CMakeLists.txt index f0374b644e..1ae468c40e 100644 --- a/tests/auto/other/macgui/.prev_CMakeLists.txt +++ b/tests/auto/other/macgui/.prev_CMakeLists.txt @@ -26,7 +26,7 @@ add_qt_test(tst_macgui ## Scopes: ##################################################################### -extend_target(tst_macgui CONDITION APPLE_MACOS +extend_target(tst_macgui CONDITION MACOS PUBLIC_LIBRARIES ${FWApplicationServices} ) diff --git a/tests/auto/other/macgui/CMakeLists.txt b/tests/auto/other/macgui/CMakeLists.txt index a85b845536..4a5aa0aaef 100644 --- a/tests/auto/other/macgui/CMakeLists.txt +++ b/tests/auto/other/macgui/CMakeLists.txt @@ -26,7 +26,7 @@ add_qt_test(tst_macgui ## Scopes: ##################################################################### -extend_target(tst_macgui CONDITION APPLE_MACOS +extend_target(tst_macgui CONDITION MACOS PUBLIC_LIBRARIES ${FWApplicationServices} ) diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt index 09dbc428ec..346e2a7d5a 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt @@ -23,5 +23,5 @@ add_qt_test(tst_qfilesystemmodel #### Keys ignored in scope 2:.:.:qfilesystemmodel.pro:WIN32: # testcase.timeout = "900" -#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:APPLE_MACOS: +#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:MACOS: # testcase.timeout = "900" diff --git a/tests/auto/widgets/styles/CMakeLists.txt b/tests/auto/widgets/styles/CMakeLists.txt index 73bbbeb4ee..4ded7b9d80 100644 --- a/tests/auto/widgets/styles/CMakeLists.txt +++ b/tests/auto/widgets/styles/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from styles.pro. -if (APPLE_MACOS) +if (MACOS) add_subdirectory(qmacstyle) endif() add_subdirectory(qstyle) -if (NOT APPLE_UIKIT AND NOT ANDROID AND NOT QNX) +if (NOT UIKIT AND NOT ANDROID AND NOT QNX) add_subdirectory(qstyleoption) endif() if (QT_FEATURE_private_tests) diff --git a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt index 7be44863c6..615a5a98cb 100644 --- a/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qlineedit/CMakeLists.txt @@ -19,7 +19,7 @@ add_qt_test(tst_qlineedit ## Scopes: ##################################################################### -extend_target(tst_qlineedit CONDITION APPLE_MACOS +extend_target(tst_qlineedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt index 711d360993..63037b7eaa 100644 --- a/tests/auto/widgets/widgets/qmenu/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenu/CMakeLists.txt @@ -17,14 +17,14 @@ add_qt_test(tst_qmenu ## Scopes: ##################################################################### -extend_target(tst_qmenu CONDITION APPLE_MACOS +extend_target(tst_qmenu CONDITION MACOS SOURCES tst_qmenu_mac.mm PUBLIC_LIBRARIES objc ) -extend_target(tst_qmenu CONDITION NOT APPLE_MACOS +extend_target(tst_qmenu CONDITION NOT MACOS DEFINES QTEST_QPA_MOUSE_HANDLING ) diff --git a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt index 0bfb6ac12d..415f2aa79f 100644 --- a/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qmenubar/CMakeLists.txt @@ -16,7 +16,7 @@ add_qt_test(tst_qmenubar ## Scopes: ##################################################################### -extend_target(tst_qmenubar CONDITION APPLE_MACOS +extend_target(tst_qmenubar CONDITION MACOS SOURCES tst_qmenubar_mac.mm PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt index 6e3ffec498..cb00d5dd93 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt @@ -19,7 +19,7 @@ add_qt_test(tst_qplaintextedit ## Scopes: ##################################################################### -extend_target(tst_qplaintextedit CONDITION APPLE_MACOS +extend_target(tst_qplaintextedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) diff --git a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt index 4a67320a31..719acd8dbc 100644 --- a/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qtextedit/CMakeLists.txt @@ -22,7 +22,7 @@ add_qt_test(tst_qtextedit ## Scopes: ##################################################################### -extend_target(tst_qtextedit CONDITION APPLE_MACOS +extend_target(tst_qtextedit CONDITION MACOS PUBLIC_LIBRARIES ${FWAppKit} ) |