diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-07 18:34:17 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 09:38:39 +0200 |
| commit | db397d11130639abae1b1438b0685db2c75db330 (patch) | |
| tree | a97939cbefc3779e8a3e1ff339ad37f17806a8d7 /tests/auto/widgets | |
| parent | e9a328bc0e56b429a370b13c8e0b4790916cebde (diff) | |
CMake: Regenerate subdir test projects
And generate a few more test projects that were missing.
Change-Id: I5df51106549aa5ae09bc3c42360e14b143719547
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/widgets')
| -rw-r--r-- | tests/auto/widgets/effects/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/itemviews/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/widgets/kernel/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/auto/widgets/styles/CMakeLists.txt | 8 |
4 files changed, 13 insertions, 10 deletions
diff --git a/tests/auto/widgets/effects/CMakeLists.txt b/tests/auto/widgets/effects/CMakeLists.txt index 2e2045e33e..3c0af4537a 100644 --- a/tests/auto/widgets/effects/CMakeLists.txt +++ b/tests/auto/widgets/effects/CMakeLists.txt @@ -1,2 +1,4 @@ +# Generated from effects.pro. + add_subdirectory(qgraphicseffect) add_subdirectory(qpixmapfilter) diff --git a/tests/auto/widgets/itemviews/CMakeLists.txt b/tests/auto/widgets/itemviews/CMakeLists.txt index a3737b2abc..ec6e00ec7f 100644 --- a/tests/auto/widgets/itemviews/CMakeLists.txt +++ b/tests/auto/widgets/itemviews/CMakeLists.txt @@ -13,7 +13,6 @@ add_subdirectory(qtablewidget) add_subdirectory(qtreeview) add_subdirectory(qtreewidget) add_subdirectory(qtreewidgetitemiterator) - if(QT_FEATURE_private_tests) add_subdirectory(qcolumnview) add_subdirectory(qlistwidget) diff --git a/tests/auto/widgets/kernel/CMakeLists.txt b/tests/auto/widgets/kernel/CMakeLists.txt index ec32603585..0c48aec149 100644 --- a/tests/auto/widgets/kernel/CMakeLists.txt +++ b/tests/auto/widgets/kernel/CMakeLists.txt @@ -1,7 +1,5 @@ # Generated from kernel.pro. -add_subdirectory(qaction) -add_subdirectory(qactiongroup) add_subdirectory(qapplication) add_subdirectory(qboxlayout) add_subdirectory(qformlayout) @@ -11,12 +9,18 @@ add_subdirectory(qstackedlayout) add_subdirectory(qtooltip) add_subdirectory(qwidget) add_subdirectory(qwidget_window) -add_subdirectory(qwidgetaction) add_subdirectory(qwidgetmetatype) add_subdirectory(qwidgetsvariant) add_subdirectory(qwindowcontainer) -add_subdirectory(qshortcut) add_subdirectory(qsizepolicy) if(NOT APPLE) add_subdirectory(qgesturerecognizer) endif() +if(QT_FEATURE_shortcut) + add_subdirectory(qshortcut) +endif() +if(QT_FEATURE_action) + add_subdirectory(qaction) + add_subdirectory(qactiongroup) + add_subdirectory(qwidgetaction) +endif() diff --git a/tests/auto/widgets/styles/CMakeLists.txt b/tests/auto/widgets/styles/CMakeLists.txt index 4ded7b9d80..b1c9d1fce3 100644 --- a/tests/auto/widgets/styles/CMakeLists.txt +++ b/tests/auto/widgets/styles/CMakeLists.txt @@ -1,12 +1,10 @@ # Generated from styles.pro. -if (MACOS) +if(APPLE) add_subdirectory(qmacstyle) endif() add_subdirectory(qstyle) -if (NOT UIKIT AND NOT ANDROID AND NOT QNX) - add_subdirectory(qstyleoption) -endif() -if (QT_FEATURE_private_tests) +add_subdirectory(qstyleoption) +if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT QNX AND NOT UIKIT) add_subdirectory(qstylesheetstyle) endif() |