diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2022-11-23 16:50:43 +0800 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2022-12-01 10:26:28 +0800 |
commit | 8b100bed5237b1ec864f059d7fb04b94fd874f49 (patch) | |
tree | 3e0503297e0dcdee3ea6245f480b9ce65766a056 /examples/quickcontrols | |
parent | 4bd87b903b355b53e3105ba1ae7c154c4e55cdaf (diff) |
Doc: remove "2" from Qt Quick Controls files
Work on this was already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.
The CMake target (docs_QuickControls2) probably can't be renamed
until we rename the library, which won't happen until Qt 7.
Task-number: QTBUG-95413
Change-Id: Ied20805a91286436606577c3de39671a447f27dd
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'examples/quickcontrols')
-rw-r--r-- | examples/quickcontrols/attachedstyleproperties/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols-attachedstyleproperties.png (renamed from examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols2-attachedstyleproperties.png) | bin | 11703 -> 11703 bytes | |||
-rw-r--r-- | examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols-attachedstyleproperties.qdoc (renamed from examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols2-attachedstyleproperties.qdoc) | 4 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter1/chapter1.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter2/chapter2.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter3/chapter3.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter4/chapter4.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/chapter5/chapter5.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter1.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png) | bin | 4798 -> 4798 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2-listview-header.gif (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif) | bin | 176936 -> 176936 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png) | bin | 20119 -> 20119 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-listview-header.gif (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif) | bin | 262432 -> 262432 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-view-margins.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png) | bin | 2960 -> 2960 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3.gif (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif) | bin | 169856 -> 169856 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-long-message.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png) | bin | 13079 -> 13079 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-message-timestamp.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png) | bin | 9750 -> 9750 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4.gif (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif) | bin | 102536 -> 102536 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png) | bin | 19787 -> 19787 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-test.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png) | bin | 17337 -> 17337 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png) | bin | 17475 -> 17475 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png) | bin | 15520 -> 15520 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png) | bin | 16575 -> 16575 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png) | bin | 14723 -> 14723 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-test.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png) | bin | 2688 -> 2688 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png) | bin | 2861 -> 2861 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png) | bin | 8590 -> 8590 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal.png (renamed from examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png) | bin | 9627 -> 9627 bytes | |||
-rw-r--r-- | examples/quickcontrols/chattutorial/doc/src/qtquickcontrols-chattutorial.qdoc (renamed from examples/quickcontrols/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc) | 40 | ||||
-rw-r--r-- | examples/quickcontrols/contactlist/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/contactlist/contactlist.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/contactlist/doc/images/qtquickcontrols-contactlist.png (renamed from examples/quickcontrols/contactlist/doc/images/qtquickcontrols2-contactlist.png) | bin | 23581 -> 23581 bytes | |||
-rw-r--r-- | examples/quickcontrols/contactlist/doc/src/qtquickcontrols-contactlist.qdoc (renamed from examples/quickcontrols/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc) | 4 | ||||
-rw-r--r-- | examples/quickcontrols/eventcalendar/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols-eventcalendar.qdoc (renamed from examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols2-eventcalendar.qdoc) | 2 | ||||
-rw-r--r-- | examples/quickcontrols/flatstyle/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle-creator.png (renamed from examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png) | bin | 22469 -> 22469 bytes | |||
-rw-r--r-- | examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle.png (renamed from examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle.png) | bin | 9120 -> 9120 bytes | |||
-rw-r--r-- | examples/quickcontrols/flatstyle/doc/src/qtquickcontrols-flatstyle.qdoc (renamed from examples/quickcontrols/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc) | 6 | ||||
-rw-r--r-- | examples/quickcontrols/flatstyle/flatstyle.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/gallery/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-drawer.png (renamed from examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-drawer.png) | bin | 15428 -> 15428 bytes | |||
-rw-r--r-- | examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-menu.png (renamed from examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-menu.png) | bin | 15953 -> 15953 bytes | |||
-rw-r--r-- | examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-welcome.png (renamed from examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-welcome.png) | bin | 18513 -> 18513 bytes | |||
-rw-r--r-- | examples/quickcontrols/gallery/doc/src/qtquickcontrols-gallery.qdoc (renamed from examples/quickcontrols/gallery/doc/src/qtquickcontrols2-gallery.qdoc) | 8 | ||||
-rw-r--r-- | examples/quickcontrols/gallery/gallery.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/imagine/automotive/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/imagine/automotive/automotive.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols-automotive.png (renamed from examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols2-automotive.png) | bin | 356738 -> 356738 bytes | |||
-rw-r--r-- | examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols-automotive.qdoc (renamed from examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc) | 4 | ||||
-rw-r--r-- | examples/quickcontrols/imagine/musicplayer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols-musicplayer.png (renamed from examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png) | bin | 1457884 -> 1457884 bytes | |||
-rw-r--r-- | examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols-musicplayer.qdoc (renamed from examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc) | 4 | ||||
-rw-r--r-- | examples/quickcontrols/imagine/musicplayer/musicplayer.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols-todolist.png (renamed from examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols2-todolist.png) | bin | 67497 -> 67497 bytes | |||
-rw-r--r-- | examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols-todolist.qdoc (renamed from examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols2-todolist.qdoc) | 4 | ||||
-rw-r--r-- | examples/quickcontrols/ios/todolist/todolist.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/sidepanel/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-landscape.png (renamed from examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png) | bin | 55216 -> 55216 bytes | |||
-rw-r--r-- | examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-portrait.png (renamed from examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png) | bin | 32060 -> 32060 bytes | |||
-rw-r--r-- | examples/quickcontrols/sidepanel/doc/src/qtquickcontrols-sidepanel.qdoc (renamed from examples/quickcontrols/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc) | 6 | ||||
-rw-r--r-- | examples/quickcontrols/sidepanel/sidepanel.pro | 6 | ||||
-rw-r--r-- | examples/quickcontrols/swipetoremove/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols-swipetoremove.png (renamed from examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png) | bin | 22511 -> 22511 bytes | |||
-rw-r--r-- | examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols-swipetoremove.qdoc (renamed from examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc) | 4 | ||||
-rw-r--r-- | examples/quickcontrols/swipetoremove/swipetoremove.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/texteditor/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-desktop.jpg (renamed from examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg) | bin | 76304 -> 76304 bytes | |||
-rw-r--r-- | examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-touch.jpg (renamed from examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg) | bin | 31203 -> 31203 bytes | |||
-rw-r--r-- | examples/quickcontrols/texteditor/doc/src/qtquickcontrols-texteditor.qdoc (renamed from examples/quickcontrols/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc) | 6 | ||||
-rw-r--r-- | examples/quickcontrols/texteditor/texteditor.pro | 2 | ||||
-rw-r--r-- | examples/quickcontrols/wearable/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/quickcontrols/wearable/doc/images/qtquickcontrols-wearable.png (renamed from examples/quickcontrols/wearable/doc/images/qtquickcontrols2-wearable.png) | bin | 108926 -> 108926 bytes | |||
-rw-r--r-- | examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc (renamed from examples/quickcontrols/wearable/doc/src/qtquickcontrols2-wearable.qdoc) | 4 | ||||
-rw-r--r-- | examples/quickcontrols/wearable/wearable.pro | 2 |
80 files changed, 84 insertions, 84 deletions
diff --git a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt index 229129f5c6..8915937222 100644 --- a/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt +++ b/examples/quickcontrols/attachedstyleproperties/CMakeLists.txt @@ -7,7 +7,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/attachedstyleproperties") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/attachedstyleproperties") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml QuickControls2) qt_standard_project_setup() diff --git a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt index 81b15f128f..2ac65d3f57 100644 --- a/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt +++ b/examples/quickcontrols/attachedstyleproperties/MyStyle/CMakeLists.txt @@ -2,7 +2,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) message(FATAL_ERROR "MyStyle should be built as part of the 'attachedstyleproperties' project, and not in isolation.") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/attachedstyleproperties") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/attachedstyleproperties") qt_add_qml_module(MyStyle URI MyStyle diff --git a/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols2-attachedstyleproperties.png b/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols-attachedstyleproperties.png Binary files differindex 2cd5f214f7..2cd5f214f7 100644 --- a/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols2-attachedstyleproperties.png +++ b/examples/quickcontrols/attachedstyleproperties/doc/images/qtquickcontrols-attachedstyleproperties.png diff --git a/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols2-attachedstyleproperties.qdoc b/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols-attachedstyleproperties.qdoc index de43fc80bd..4e273ffd38 100644 --- a/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols2-attachedstyleproperties.qdoc +++ b/examples/quickcontrols/attachedstyleproperties/doc/src/qtquickcontrols-attachedstyleproperties.qdoc @@ -5,10 +5,10 @@ \example attachedstyleproperties \keyword Qt Quick Controls - Attached Style Properties Example \title Qt Quick Controls - Attached Style Properties Example - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief Demonstrates use of QQuickAttachedPropertyPropagator. - \image qtquickcontrols2-attachedstyleproperties.png + \image qtquickcontrols-attachedstyleproperties.png The Attached Style Properties example is a simple application that shows how to use \l QQuickAttachedPropertyPropagator to propagate attached diff --git a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt index 3320012cb4..e75da2d2ef 100644 --- a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter1") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter1") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) diff --git a/examples/quickcontrols/chattutorial/chapter1/chapter1.pro b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro index 6b50809f20..c44cd50659 100644 --- a/examples/quickcontrols/chattutorial/chapter1/chapter1.pro +++ b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro @@ -10,5 +10,5 @@ resources.prefix = chapter1/ RESOURCES += resources \ qtquickcontrols2.conf -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter1 +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter1 INSTALLS += target diff --git a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt index c011336802..4bf3e834cd 100644 --- a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter2") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter2") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) diff --git a/examples/quickcontrols/chattutorial/chapter2/chapter2.pro b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro index 15429b7c89..00cf68b57c 100644 --- a/examples/quickcontrols/chattutorial/chapter2/chapter2.pro +++ b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro @@ -23,5 +23,5 @@ resources.prefix = chapter2/ RESOURCES += resources \ qtquickcontrols2.conf -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter2 +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter2 INSTALLS += target diff --git a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt index 92545ec1d0..d46fd3455d 100644 --- a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter3") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter3") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) diff --git a/examples/quickcontrols/chattutorial/chapter3/chapter3.pro b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro index 42adc69fe9..9a4c5b5703 100644 --- a/examples/quickcontrols/chattutorial/chapter3/chapter3.pro +++ b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro @@ -25,5 +25,5 @@ resources.prefix = chapter3/ RESOURCES += resources \ qtquickcontrols2.conf -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter3 +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter3 INSTALLS += target diff --git a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt index 024430a495..cf6985cfe8 100644 --- a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter4") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter4") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Sql) diff --git a/examples/quickcontrols/chattutorial/chapter4/chapter4.pro b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro index ae8141f7f1..baf2d319d5 100644 --- a/examples/quickcontrols/chattutorial/chapter4/chapter4.pro +++ b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro @@ -30,5 +30,5 @@ resources.prefix = chapter4/ RESOURCES += resources \ qtquickcontrols2.conf -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter4 +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter4 INSTALLS += target diff --git a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt index 657684fc34..0e72bc31f1 100644 --- a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt +++ b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter5") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter5") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Sql) diff --git a/examples/quickcontrols/chattutorial/chapter5/chapter5.pro b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro index 625642d7b5..3ba8d97ddc 100644 --- a/examples/quickcontrols/chattutorial/chapter5/chapter5.pro +++ b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro @@ -32,5 +32,5 @@ resources.prefix = chapter5/ RESOURCES += resources \ qtquickcontrols2.conf -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter5 +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter5 INSTALLS += target diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter1.png Binary files differindex aa3c4bb5be..aa3c4bb5be 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter1.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2-listview-header.gif Binary files differindex 17096519b0..17096519b0 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2-listview-header.gif diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2.png Binary files differindex af25cff94e..af25cff94e 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-listview-header.gif Binary files differindex 07eb93b191..07eb93b191 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-listview-header.gif diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-view-margins.png Binary files differindex 1c8ffbf46e..1c8ffbf46e 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-view-margins.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3.gif Binary files differindex 1763b1f3a5..1763b1f3a5 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3.gif diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-long-message.png Binary files differindex b2f4c2adf8..b2f4c2adf8 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-long-message.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-message-timestamp.png Binary files differindex ea75b1dce5..ea75b1dce5 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-message-timestamp.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4.gif Binary files differindex dd47c4cbf8..dd47c4cbf8 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4.gif diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png Binary files differindex 8b8f05faa1..8b8f05faa1 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-test.png Binary files differindex 29e149df9f..29e149df9f 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-test.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material.png Binary files differindex 23d744e7be..23d744e7be 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png Binary files differindex 2aef535c39..2aef535c39 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal.png Binary files differindex c18a341b42..c18a341b42 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png Binary files differindex f15c7d7d76..f15c7d7d76 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-test.png Binary files differindex b33fc74ea6..b33fc74ea6 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-test.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material.png Binary files differindex 31833164d8..31833164d8 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png Binary files differindex b4bd7e9f4f..b4bd7e9f4f 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal.png Binary files differindex 09ed5ceb94..09ed5ceb94 100644 --- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png +++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal.png diff --git a/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols-chattutorial.qdoc index 52228b900d..c34c20d508 100644 --- a/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc +++ b/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols-chattutorial.qdoc @@ -7,7 +7,7 @@ \title Qt Quick Controls - Chat Tutorial \keyword Qt Quick Controls 2 - Chat Tutorial \brief Tutorial about writing a basic chat client using Qt Quick Controls. -\ingroup qtquickcontrols2-examples +\ingroup qtquickcontrols-examples This tutorial shows how to write a basic chat application using Qt Quick Controls. It will also explain how to integrate an SQL database into a Qt @@ -193,7 +193,7 @@ It determines where the example is copied, on running "\c{make install}". Now we can build and run the application: -\borderedimage qtquickcontrols2-chattutorial-chapter1.png +\borderedimage qtquickcontrols-chattutorial-chapter1.png \noautolist \generatelist examplefiles .*chapter1.* @@ -270,7 +270,7 @@ The image will be \c 40 pixels wide and \c 40 pixels high. We'll base the height of the delegate on the image's height, so that we don't have any empty vertical space. -\borderedimage qtquickcontrols2-chattutorial-chapter2.png +\borderedimage qtquickcontrols-chattutorial-chapter2.png \generatelist examplefiles .*(chapter2|shared).* \generatelist exampleimages .*shared.*(Einstein|Hemingway|Gude)\.png @@ -324,7 +324,7 @@ In chapter 2, we added a ListView below the header. If you run the application for that chapter, you'll see that the contents of the view can be scrolled over the top of the header: -\borderedimage qtquickcontrols2-chattutorial-chapter2-listview-header.gif +\borderedimage qtquickcontrols-chattutorial-chapter2-listview-header.gif This is not that nice, especially if the text in the delegates is long enough that it reaches the text in the header. What we @@ -344,7 +344,7 @@ usual, comes from the application style. Here it is in action: \printuntil } \printuntil } -\borderedimage qtquickcontrols2-chattutorial-chapter3-listview-header.gif +\borderedimage qtquickcontrols-chattutorial-chapter3-listview-header.gif It has no layout of its own, so we center the label within it ourselves. @@ -445,7 +445,7 @@ After filling the width and height of its parent, we also set some margins on the view. This gives us a nice alignment with the placeholder text in the "compose message" field: -\borderedimage qtquickcontrols2-chattutorial-chapter3-view-margins.png +\borderedimage qtquickcontrols-chattutorial-chapter3-view-margins.png Next, we set \l {ListView::}{displayMarginBeginning} and \l {ListView::}{displayMarginEnd}. These properties ensure that the delegates @@ -497,7 +497,7 @@ does not go outside of the screen. Finally, the button is only enabled when there is actually a message to send. -\borderedimage qtquickcontrols2-chattutorial-chapter3.gif +\borderedimage qtquickcontrols-chattutorial-chapter3.gif \generatelist examplefiles .*(chapter3|shared).* \generatelist exampleimages .*shared.*(Einstein|Hemingway|Gude)\.png @@ -678,7 +678,7 @@ timestamp that we want to display below every message: \printuntil } \printuntil } -\borderedimage qtquickcontrols2-chattutorial-chapter4-message-timestamp.png +\borderedimage qtquickcontrols-chattutorial-chapter4-message-timestamp.png Now that we have a proper model, we can use its \c recipient role in the expression for the \c sentByMe property. @@ -700,7 +700,7 @@ smaller value. However, in the image below, the message text is quite long, so the smaller value (the width of the view) is chosen, ensuring that the text stops at the opposite edge of the screen: -\borderedimage qtquickcontrols2-chattutorial-chapter4-long-message.png +\borderedimage qtquickcontrols-chattutorial-chapter4-long-message.png In order to display the timestamp for each message that we discussed earlier, we use a Label. The date and time are formatted with @@ -716,7 +716,7 @@ First, we call the invokable \c sendMessage() function of the model, which inserts a new row into the Conversations database table. Then, we clear the text field to make way for future input. -\borderedimage qtquickcontrols2-chattutorial-chapter4.gif +\borderedimage qtquickcontrols-chattutorial-chapter4.gif \generatelist examplefiles .*(chapter4|shared).* \generatelist exampleimages @@ -732,12 +732,12 @@ So far, we've just been testing the application with the Basic style. If we run it with the \l {Material Style}, for example, we'll immediately see some issues. Here is the Contacts page: -\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png +\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-material-test.png The header text is black on a dark blue background, which is very difficult to read. The same thing occurs with the Conversations page: -\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png +\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-material-test.png The solution is to tell the toolbar that it should use the \e "Dark" theme, so that this information is propagated to its children, allowing them to switch @@ -808,13 +808,13 @@ We'll make the same changes to \c ConversationPage.qml: Now both pages look correct: -\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-material.png -\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-material.png +\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-material.png +\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-material.png Let's try out the Universal style: -\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-universal.png -\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-universal.png +\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-universal.png +\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-universal.png No issues there. For a relatively simple application such as this one, there should be very few adjustments necessary when switching styles. @@ -833,8 +833,8 @@ Theme=Dark Once this is done, build and run the application. This is what you should see: -\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png -\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png +\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png +\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png Both pages look fine. Now add an entry for the Universal style: @@ -845,8 +845,8 @@ Theme=Dark After building and running the application, you should see these results: -\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png -\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png +\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png +\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png \generatelist examplefiles .*(chapter5|shared).* \generatelist exampleimages diff --git a/examples/quickcontrols/contactlist/CMakeLists.txt b/examples/quickcontrols/contactlist/CMakeLists.txt index ac7eccd9a7..b9ca81a90d 100644 --- a/examples/quickcontrols/contactlist/CMakeLists.txt +++ b/examples/quickcontrols/contactlist/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/contactlist") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/contactlist") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick) diff --git a/examples/quickcontrols/contactlist/contactlist.pro b/examples/quickcontrols/contactlist/contactlist.pro index 101db15a3d..ceb99cbc47 100644 --- a/examples/quickcontrols/contactlist/contactlist.pro +++ b/examples/quickcontrols/contactlist/contactlist.pro @@ -24,5 +24,5 @@ QML_DESIGNER_IMPORT_PATH = $$PWD/designer OTHER_FILES += \ designer/Backend/*.qml -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/contactlist +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/contactlist INSTALLS += target diff --git a/examples/quickcontrols/contactlist/doc/images/qtquickcontrols2-contactlist.png b/examples/quickcontrols/contactlist/doc/images/qtquickcontrols-contactlist.png Binary files differindex 9f1c306544..9f1c306544 100644 --- a/examples/quickcontrols/contactlist/doc/images/qtquickcontrols2-contactlist.png +++ b/examples/quickcontrols/contactlist/doc/images/qtquickcontrols-contactlist.png diff --git a/examples/quickcontrols/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc b/examples/quickcontrols/contactlist/doc/src/qtquickcontrols-contactlist.qdoc index 3f88d9dc74..7decce2e05 100644 --- a/examples/quickcontrols/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc +++ b/examples/quickcontrols/contactlist/doc/src/qtquickcontrols-contactlist.qdoc @@ -5,7 +5,7 @@ \keyword Qt Quick Controls - Contact List \title Qt Quick Controls - Contact List \keyword Qt Quick Controls 2 - Contact List - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief A QML app using Qt Quick Controls and a C++ class that implements a simple contact list. @@ -14,7 +14,7 @@ For the declarative parts of the UI, .ui.qml files are used that can be edited visually in the Qt Quick Designer. - \image qtquickcontrols2-contactlist.png + \image qtquickcontrols-contactlist.png \section1 C++ Backend diff --git a/examples/quickcontrols/eventcalendar/CMakeLists.txt b/examples/quickcontrols/eventcalendar/CMakeLists.txt index 6c44eb82ec..dc2657eea8 100644 --- a/examples/quickcontrols/eventcalendar/CMakeLists.txt +++ b/examples/quickcontrols/eventcalendar/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/eventcalendar") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/eventcalendar") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Sql) diff --git a/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols2-eventcalendar.qdoc b/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols-eventcalendar.qdoc index cc0b031b51..567ad12fa1 100644 --- a/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols2-eventcalendar.qdoc +++ b/examples/quickcontrols/eventcalendar/doc/src/qtquickcontrols-eventcalendar.qdoc @@ -5,7 +5,7 @@ \example eventcalendar \keyword Qt Quick Controls - Event Calendar \title Qt Quick Controls - Event Calendar - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief A simple event calendar. \image qtquickcalendar-eventcalendar.png diff --git a/examples/quickcontrols/flatstyle/CMakeLists.txt b/examples/quickcontrols/flatstyle/CMakeLists.txt index 7ddb17c99b..b8de1b7adb 100644 --- a/examples/quickcontrols/flatstyle/CMakeLists.txt +++ b/examples/quickcontrols/flatstyle/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/flatstyle") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/flatstyle") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2 Widgets) diff --git a/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle-creator.png Binary files differindex d77a7ffc4b..d77a7ffc4b 100644 --- a/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png +++ b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle-creator.png diff --git a/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle.png b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle.png Binary files differindex a43b4c39fa..a43b4c39fa 100644 --- a/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols2-flatstyle.png +++ b/examples/quickcontrols/flatstyle/doc/images/qtquickcontrols-flatstyle.png diff --git a/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols-flatstyle.qdoc index b077ef71c6..3f5a982b7d 100644 --- a/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc +++ b/examples/quickcontrols/flatstyle/doc/src/qtquickcontrols-flatstyle.qdoc @@ -6,7 +6,7 @@ \keyword Qt Quick Controls - Flat Style \title Qt Quick Controls - Flat Style \keyword Qt Quick Controls 2 - Flat Style - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief A QML app using Qt Quick Controls and a QML plugin with customized controls. @@ -15,7 +15,7 @@ declarative parts of the UI, \c .ui.qml files are used. These can be edited visually in Qt Quick Designer. - \borderedimage qtquickcontrols2-flatstyle.png + \borderedimage qtquickcontrols-flatstyle.png \section1 QML Plugin @@ -58,7 +58,7 @@ To edit the indicator of a switch in Qt Quick Designer we can open Switch.qml and then enter the implementation of the indicator called \c switchHandle using the combo box on the top next to the combo box for the open documents. - \borderedimage qtquickcontrols2-flatstyle-creator.png + \borderedimage qtquickcontrols-flatstyle-creator.png The application itself is just a simple form that allows the user to adjust a couple of parameters of the custom controls. The user can choose another main color, set the font to bold or underline, and increase the size of the controls by diff --git a/examples/quickcontrols/flatstyle/flatstyle.pro b/examples/quickcontrols/flatstyle/flatstyle.pro index c430a30af4..a111d5f2f1 100644 --- a/examples/quickcontrols/flatstyle/flatstyle.pro +++ b/examples/quickcontrols/flatstyle/flatstyle.pro @@ -19,5 +19,5 @@ RESOURCES += \ # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = $$PWD/imports -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/flatstyle +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/flatstyle INSTALLS += target diff --git a/examples/quickcontrols/gallery/CMakeLists.txt b/examples/quickcontrols/gallery/CMakeLists.txt index d2858c8c59..85d8189f9c 100644 --- a/examples/quickcontrols/gallery/CMakeLists.txt +++ b/examples/quickcontrols/gallery/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/gallery") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/gallery") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2) diff --git a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-drawer.png b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-drawer.png Binary files differindex 0df43fbc4b..0df43fbc4b 100644 --- a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-drawer.png +++ b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-drawer.png diff --git a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-menu.png b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-menu.png Binary files differindex 3bdaae942a..3bdaae942a 100644 --- a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-menu.png +++ b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-menu.png diff --git a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-welcome.png b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-welcome.png Binary files differindex ded30381d2..ded30381d2 100644 --- a/examples/quickcontrols/gallery/doc/images/qtquickcontrols2-gallery-welcome.png +++ b/examples/quickcontrols/gallery/doc/images/qtquickcontrols-gallery-welcome.png diff --git a/examples/quickcontrols/gallery/doc/src/qtquickcontrols2-gallery.qdoc b/examples/quickcontrols/gallery/doc/src/qtquickcontrols-gallery.qdoc index 814768fe61..2fc1ed8f46 100644 --- a/examples/quickcontrols/gallery/doc/src/qtquickcontrols2-gallery.qdoc +++ b/examples/quickcontrols/gallery/doc/src/qtquickcontrols-gallery.qdoc @@ -6,24 +6,24 @@ \keyword Qt Quick Controls - Gallery \title Qt Quick Controls - Gallery \keyword Qt Quick Controls 2 - Gallery - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief A gallery of controls. \raw HTML <div class="table"><table style="background:transparent; border:0px"> <tr><td style="border:0px"> \endraw - \image qtquickcontrols2-gallery-welcome.png + \image qtquickcontrols-gallery-welcome.png \caption Welcome Screen \raw HTML </td><td style="border:0px"> \endraw - \image qtquickcontrols2-gallery-drawer.png + \image qtquickcontrols-gallery-drawer.png \caption Side Drawer \raw HTML </td><td style="border:0px"> \endraw - \image qtquickcontrols2-gallery-menu.png + \image qtquickcontrols-gallery-menu.png \caption Options Menu \raw HTML </td></tr> diff --git a/examples/quickcontrols/gallery/gallery.pro b/examples/quickcontrols/gallery/gallery.pro index e1ac462a7c..42dc098425 100644 --- a/examples/quickcontrols/gallery/gallery.pro +++ b/examples/quickcontrols/gallery/gallery.pro @@ -64,5 +64,5 @@ RESOURCES += \ ToolBar.qml \ +Material/ToolBar.qml -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/gallery INSTALLS += target diff --git a/examples/quickcontrols/imagine/automotive/CMakeLists.txt b/examples/quickcontrols/imagine/automotive/CMakeLists.txt index 2f213f8e79..6769057db7 100644 --- a/examples/quickcontrols/imagine/automotive/CMakeLists.txt +++ b/examples/quickcontrols/imagine/automotive/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/imagine/automotive") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/imagine/automotive") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2) diff --git a/examples/quickcontrols/imagine/automotive/automotive.pro b/examples/quickcontrols/imagine/automotive/automotive.pro index 890e63d84b..25a78e9d43 100644 --- a/examples/quickcontrols/imagine/automotive/automotive.pro +++ b/examples/quickcontrols/imagine/automotive/automotive.pro @@ -11,5 +11,5 @@ RESOURCES += \ qml/qml.qrc \ qtquickcontrols2.conf -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/imagine/automotive +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/imagine/automotive INSTALLS += target diff --git a/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols2-automotive.png b/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols-automotive.png Binary files differindex 93ea28545b..93ea28545b 100644 --- a/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols2-automotive.png +++ b/examples/quickcontrols/imagine/automotive/doc/images/qtquickcontrols-automotive.png diff --git a/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc b/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols-automotive.qdoc index 6e228efd8e..81503200f3 100644 --- a/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc +++ b/examples/quickcontrols/imagine/automotive/doc/src/qtquickcontrols-automotive.qdoc @@ -6,13 +6,13 @@ \keyword Qt Quick Controls - Imagine Style Example: Automotive \title Qt Quick Controls - Imagine Style Example: Automotive \keyword Qt Quick Controls 2 - Imagine Style Example: Automotive - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief An automotive user interface using custom Imagine style assets. This example demonstrates how custom Imagine style assets can be used to style an automotive user interface. - \image qtquickcontrols2-automotive.png + \image qtquickcontrols-automotive.png \include examples-run.qdocinc */ diff --git a/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt index a3f0bf5683..422319c1f5 100644 --- a/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt +++ b/examples/quickcontrols/imagine/musicplayer/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/imagine/musicplayer") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/imagine/musicplayer") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2) diff --git a/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png b/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols-musicplayer.png Binary files differindex 25b6344f3e..25b6344f3e 100644 --- a/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols2-musicplayer.png +++ b/examples/quickcontrols/imagine/musicplayer/doc/images/qtquickcontrols-musicplayer.png diff --git a/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc b/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols-musicplayer.qdoc index 742b412c96..fa36097225 100644 --- a/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc +++ b/examples/quickcontrols/imagine/musicplayer/doc/src/qtquickcontrols-musicplayer.qdoc @@ -6,13 +6,13 @@ \keyword Qt Quick Controls - Imagine Style Example: Music Player \title Qt Quick Controls - Imagine Style Example: Music Player \keyword Qt Quick Controls 2 - Imagine Style Example: Music Player - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief An audio player user interface using custom Imagine style assets. This example demonstrates how custom Imagine style assets can be used to style a user interface for an audio player application. - \image qtquickcontrols2-musicplayer.png + \image qtquickcontrols-musicplayer.png \omit The assets are generated from a Photoshop file: \e musicplayer.psd. diff --git a/examples/quickcontrols/imagine/musicplayer/musicplayer.pro b/examples/quickcontrols/imagine/musicplayer/musicplayer.pro index b1970ee905..67c716406e 100644 --- a/examples/quickcontrols/imagine/musicplayer/musicplayer.pro +++ b/examples/quickcontrols/imagine/musicplayer/musicplayer.pro @@ -12,5 +12,5 @@ RESOURCES += \ qtquickcontrols2.conf \ musicplayer.qml -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/imagine/musicplayer +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/imagine/musicplayer INSTALLS += target diff --git a/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols2-todolist.png b/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols-todolist.png Binary files differindex 5be7190a43..5be7190a43 100644 --- a/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols2-todolist.png +++ b/examples/quickcontrols/ios/todolist/doc/images/qtquickcontrols-todolist.png diff --git a/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols2-todolist.qdoc b/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols-todolist.qdoc index 12e2d4fca5..43e1e9310e 100644 --- a/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols2-todolist.qdoc +++ b/examples/quickcontrols/ios/todolist/doc/src/qtquickcontrols-todolist.qdoc @@ -6,13 +6,13 @@ \keyword Qt Quick Controls - To Do List \title Qt Quick Controls - To Do List \keyword Qt Quick Controls 2 - To Do List - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief To do list application for iOS. This example demonstrates how to create a simple to do list application for iOS using the \l {iOS Style}. - \image qtquickcontrols2-todolist.png + \image qtquickcontrols-todolist.png The example also shows how an in-memory SQL database can be created and used purely through QML, without needing C++, through the use of diff --git a/examples/quickcontrols/ios/todolist/todolist.pro b/examples/quickcontrols/ios/todolist/todolist.pro index d77d718a62..e144770728 100644 --- a/examples/quickcontrols/ios/todolist/todolist.pro +++ b/examples/quickcontrols/ios/todolist/todolist.pro @@ -38,5 +38,5 @@ RESOURCES += \ ToggleCompletedTasksPage.qml \ qmldir -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/ios/todolist +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/ios/todolist INSTALLS += target diff --git a/examples/quickcontrols/sidepanel/CMakeLists.txt b/examples/quickcontrols/sidepanel/CMakeLists.txt index 7a832eda13..e8f01ad6dd 100644 --- a/examples/quickcontrols/sidepanel/CMakeLists.txt +++ b/examples/quickcontrols/sidepanel/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/sidepanel") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/sidepanel") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick) @@ -30,8 +30,8 @@ qt_add_qml_module(sidepanelexample "images/qt-logo@3x.png" "images/qt-logo@4x.png" "qtquickcontrols2.conf" - "doc/images/qtquickcontrols2-sidepanel-landscape.png" - "doc/images/qtquickcontrols2-sidepanel-portrait.png" + "doc/images/qtquickcontrols-sidepanel-landscape.png" + "doc/images/qtquickcontrols-sidepanel-portrait.png" ) target_link_libraries(sidepanelexample PUBLIC diff --git a/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-landscape.png Binary files differindex 86907591b2..86907591b2 100644 --- a/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png +++ b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-landscape.png diff --git a/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-portrait.png Binary files differindex cf1ed2efd0..cf1ed2efd0 100644 --- a/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png +++ b/examples/quickcontrols/sidepanel/doc/images/qtquickcontrols-sidepanel-portrait.png diff --git a/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc b/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols-sidepanel.qdoc index d5baa46eef..7029099d0f 100644 --- a/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc +++ b/examples/quickcontrols/sidepanel/doc/src/qtquickcontrols-sidepanel.qdoc @@ -6,7 +6,7 @@ \keyword Qt Quick Controls - Side Panel \title Qt Quick Controls - Side Panel \keyword Qt Quick Controls 2 - Side Panel - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief A persistent side panel with Drawer. This example demonstrates how \l Drawer can be used as a persistent side @@ -16,12 +16,12 @@ <div class="table"><table style="background:transparent; border:0px"> <tr><td style="border:0px"> \endraw - \image qtquickcontrols2-sidepanel-portrait.png + \image qtquickcontrols-sidepanel-portrait.png \caption An interactive Drawer in portrait mode \raw HTML </td><td style="border:0px"> \endraw - \image qtquickcontrols2-sidepanel-landscape.png + \image qtquickcontrols-sidepanel-landscape.png \caption A non-interactive Drawer in landscape mode \raw HTML </td></tr> diff --git a/examples/quickcontrols/sidepanel/sidepanel.pro b/examples/quickcontrols/sidepanel/sidepanel.pro index 3ae9cd8d6b..bbf118b361 100644 --- a/examples/quickcontrols/sidepanel/sidepanel.pro +++ b/examples/quickcontrols/sidepanel/sidepanel.pro @@ -6,8 +6,8 @@ SOURCES += \ sidepanel.cpp RESOURCES += \ - doc/images/qtquickcontrols2-sidepanel-landscape.png \ - doc/images/qtquickcontrols2-sidepanel-portrait.png \ + doc/images/qtquickcontrols-sidepanel-landscape.png \ + doc/images/qtquickcontrols-sidepanel-portrait.png \ images/qt-logo@2x.png \ images/qt-logo@3x.png \ images/qt-logo@4x.png \ @@ -15,5 +15,5 @@ RESOURCES += \ qtquickcontrols2.conf \ sidepanel.qml -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/sidepanel +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/sidepanel INSTALLS += target diff --git a/examples/quickcontrols/swipetoremove/CMakeLists.txt b/examples/quickcontrols/swipetoremove/CMakeLists.txt index 813f9f1e1f..ae445cbb7c 100644 --- a/examples/quickcontrols/swipetoremove/CMakeLists.txt +++ b/examples/quickcontrols/swipetoremove/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/swipetoremove") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/swipetoremove") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml) diff --git a/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png b/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols-swipetoremove.png Binary files differindex 07a200fe92..07a200fe92 100644 --- a/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png +++ b/examples/quickcontrols/swipetoremove/doc/images/qtquickcontrols-swipetoremove.png diff --git a/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc b/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols-swipetoremove.qdoc index a8f36912b2..32cb78f14a 100644 --- a/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc +++ b/examples/quickcontrols/swipetoremove/doc/src/qtquickcontrols-swipetoremove.qdoc @@ -6,14 +6,14 @@ \keyword Qt Quick Controls - Swipe to Remove \title Qt Quick Controls - Swipe to Remove \keyword Qt Quick Controls 2 - Swipe to Remove - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief Demonstrates removal of list items by swipe gesture. This example demonstrates how \l SwipeDelegate can be used to implement removal of list items by swiping. This UI pattern is often used in touch user interfaces. - \image qtquickcontrols2-swipetoremove.png + \image qtquickcontrols-swipetoremove.png Each list item can be swiped to the left, which reveals a label on the \l {SwipeDelegate::swipe}{right} side indicating that the item will be diff --git a/examples/quickcontrols/swipetoremove/swipetoremove.pro b/examples/quickcontrols/swipetoremove/swipetoremove.pro index bcdb45cd45..e16ff8145f 100644 --- a/examples/quickcontrols/swipetoremove/swipetoremove.pro +++ b/examples/quickcontrols/swipetoremove/swipetoremove.pro @@ -6,5 +6,5 @@ SOURCES += swipetoremove.cpp RESOURCES += swipetoremove.qml -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/swipetoremove +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/swipetoremove INSTALLS += target diff --git a/examples/quickcontrols/texteditor/CMakeLists.txt b/examples/quickcontrols/texteditor/CMakeLists.txt index d978d82fce..3c2a461b02 100644 --- a/examples/quickcontrols/texteditor/CMakeLists.txt +++ b/examples/quickcontrols/texteditor/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/texteditor") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/texteditor") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2 OPTIONAL_COMPONENTS Widgets) diff --git a/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-desktop.jpg Binary files differindex 259e0e8b07..259e0e8b07 100644 --- a/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg +++ b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-desktop.jpg diff --git a/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-touch.jpg Binary files differindex 6a924cdf52..6a924cdf52 100644 --- a/examples/quickcontrols/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg +++ b/examples/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-touch.jpg diff --git a/examples/quickcontrols/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc b/examples/quickcontrols/texteditor/doc/src/qtquickcontrols-texteditor.qdoc index d626a6a04e..b1d7e842cf 100644 --- a/examples/quickcontrols/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc +++ b/examples/quickcontrols/texteditor/doc/src/qtquickcontrols-texteditor.qdoc @@ -5,7 +5,7 @@ \keyword Qt Quick Controls - Text Editor \title Qt Quick Controls - Text Editor \keyword Qt Quick Controls 2 - Text Editor - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief A QML app using Qt Quick Controls and a C++ class to provide a fully-functional rich-text editor application. @@ -16,7 +16,7 @@ \section1 Desktop User Interface - \image qtquickcontrols2-texteditor-desktop.jpg + \image qtquickcontrols-texteditor-desktop.jpg The desktop version is a complete text editor with capabilities for formatting text, and opening and saving HTML and plain text files. It demonstrates the @@ -49,7 +49,7 @@ \section1 Touch User Interface - \image qtquickcontrols2-texteditor-touch.jpg + \image qtquickcontrols-texteditor-touch.jpg The touch user interface is a simplified version of the text editor. It is suitable for touch devices with limited screen size. The example uses diff --git a/examples/quickcontrols/texteditor/texteditor.pro b/examples/quickcontrols/texteditor/texteditor.pro index deb2457615..5f021865d3 100644 --- a/examples/quickcontrols/texteditor/texteditor.pro +++ b/examples/quickcontrols/texteditor/texteditor.pro @@ -18,5 +18,5 @@ OTHER_FILES += \ RESOURCES += \ texteditor.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/texteditor +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/texteditor INSTALLS += target diff --git a/examples/quickcontrols/wearable/CMakeLists.txt b/examples/quickcontrols/wearable/CMakeLists.txt index b61064d5d9..2963040b79 100644 --- a/examples/quickcontrols/wearable/CMakeLists.txt +++ b/examples/quickcontrols/wearable/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/wearable") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/wearable") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickControls2) diff --git a/examples/quickcontrols/wearable/doc/images/qtquickcontrols2-wearable.png b/examples/quickcontrols/wearable/doc/images/qtquickcontrols-wearable.png Binary files differindex c61055340c..c61055340c 100644 --- a/examples/quickcontrols/wearable/doc/images/qtquickcontrols2-wearable.png +++ b/examples/quickcontrols/wearable/doc/images/qtquickcontrols-wearable.png diff --git a/examples/quickcontrols/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc index 8a1e021663..b6665003fd 100644 --- a/examples/quickcontrols/wearable/doc/src/qtquickcontrols2-wearable.qdoc +++ b/examples/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc @@ -6,10 +6,10 @@ \keyword Qt Quick Controls - Wearable Demo \title Qt Quick Controls - Wearable Demo \keyword Qt Quick Controls 2 - Wearable Demo - \ingroup qtquickcontrols2-examples + \ingroup qtquickcontrols-examples \brief Demonstrates an application launcher designed for wearable devices. - \image qtquickcontrols2-wearable.png + \image qtquickcontrols-wearable.png The \e {Wearable Demo} consists of an application launcher and a collection of small and simple example applications aimed at wearable devices. diff --git a/examples/quickcontrols/wearable/wearable.pro b/examples/quickcontrols/wearable/wearable.pro index 8d55e44eaa..9ca5e53dfe 100644 --- a/examples/quickcontrols/wearable/wearable.pro +++ b/examples/quickcontrols/wearable/wearable.pro @@ -8,5 +8,5 @@ SOURCES += \ RESOURCES += \ wearable.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/wearable +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/wearable INSTALLS += target |