From 8b100bed5237b1ec864f059d7fb04b94fd874f49 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 23 Nov 2022 16:50:43 +0800 Subject: 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 Reviewed-by: Qt CI Bot --- examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt | 2 +- examples/quickcontrols/chattutorial/chapter5/chapter5.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/quickcontrols/chattutorial/chapter5') 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 -- cgit v1.2.3