diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2022-11-18 15:15:16 +0800 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2022-12-01 10:26:20 +0800 |
commit | 4bd87b903b355b53e3105ba1ae7c154c4e55cdaf (patch) | |
tree | cc2edb597f0d5871302eb86e9dda78217384a5aa /tests/auto/quickcontrols/CMakeLists.txt | |
parent | 786e1748d4469c135a922a221024f3f9c421c0de (diff) |
Remove "2" from Qt Quick Controls directories
Qt Quick Controls 2 was named that way because it was a follow-up to
Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer
supported, we don't need to have "2" in the name. Work on this was
already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.
By doing this renaming a few weeks before feature freeze, it won't
affect the release but still results in as little time possible spent
manually fixing conflicts in cherry-picks from non-LTS releases as a
result of the renaming.
This patch does the following:
- Renames directories.
- Adapts CMakeLists.txt and other files to account for the new paths.
A follow-up patch will handle documentation.
It does not touch library names or other user-facing stuff, as that
will have to be done in Qt 7.
Task-number: QTBUG-95413
Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/quickcontrols/CMakeLists.txt')
-rw-r--r-- | tests/auto/quickcontrols/CMakeLists.txt | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/tests/auto/quickcontrols/CMakeLists.txt b/tests/auto/quickcontrols/CMakeLists.txt new file mode 100644 index 0000000000..10a5604649 --- /dev/null +++ b/tests/auto/quickcontrols/CMakeLists.txt @@ -0,0 +1,53 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +# Generated from auto.pro. + +add_subdirectory(accessibility) +if(NOT ANDROID) # temporarily disabled until QTBUG-100991 is fixed +add_subdirectory(controls) +endif() +add_subdirectory(cursor) +add_subdirectory(customization) +add_subdirectory(designer) +if(NOT ANDROID) # QTBUG-100258 +add_subdirectory(focus) +endif() +add_subdirectory(font) +add_subdirectory(palette) +add_subdirectory(platform) +add_subdirectory(pointerhandlers) +add_subdirectory(pressandhold) +add_subdirectory(qquickapplicationwindow) +add_subdirectory(qquickcontrol) +add_subdirectory(qquickcolor) +add_subdirectory(qquickdrawer) +add_subdirectory(qquickheaderview) +add_subdirectory(qquickiconimage) +add_subdirectory(qquickiconlabel) +add_subdirectory(qquickimaginestyle) +add_subdirectory(qquickmaterialstyle) +add_subdirectory(qquickmaterialstyleconf) +add_subdirectory(qquickmenu) +add_subdirectory(qquickmenubar) +add_subdirectory(qquickninepatchimage) +add_subdirectory(qquickpopup) +add_subdirectory(qquickstyle) +add_subdirectory(qquicktextarea) +add_subdirectory(qquicktextfield) +add_subdirectory(qquickuniversalstyle) +add_subdirectory(qquickuniversalstyleconf) +add_subdirectory(revisions) +if(NOT ANDROID) # QTBUG-100191 +add_subdirectory(sanity) +add_subdirectory(snippets) +endif() +add_subdirectory(styleimports) +add_subdirectory(styleimportscompiletimematerial) +add_subdirectory(styleimportscompiletimeqmlonly) +add_subdirectory(translation) + +if (QT_FEATURE_quick_treeview) + add_subdirectory(qquicktreeviewdelegate) +endif() + |