summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2022-12-14 12:27:08 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2022-12-14 17:39:55 +0100
commit9fb766ecd03cc12f21525bcd87290fae1df28ec2 (patch)
treeaa61188807ee4e3a151e490832e4302b44378301 /examples
parent5be40d80a1005619f7a6b4d956fad4dbd1cb4c94 (diff)
downloadqtdeclarative-9fb766ecd03cc12f21525bcd87290fae1df28ec2.tar.gz
qmake: Fix build of quickcontrols examples
The QuickControls2 module has been moved to src/quickcontrols. Its examples are in examples/quickcontrols. Adjust the .pro file name in examples/quickcontrols and fix the SUBDIRS entry to it. This amends commit 4bd87b903b355b53e3105ba1ae7c154c4e55cdaf. Pick-to: 6.5 Task-number: QTBUG-109383 Change-Id: I9de70a773a11344398c01b3e84e557213268c935 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/examples.pro2
-rw-r--r--examples/quickcontrols/quickcontrols.pro (renamed from examples/quickcontrols/quickcontrols2.pro)0
2 files changed, 1 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 7c500795b6..a106166f20 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,5 +1,5 @@
TEMPLATE = subdirs
qtHaveModule(qmltest): SUBDIRS += qmltest
SUBDIRS += qml
-qtHaveModule(quick): SUBDIRS += quick quickcontrols2
+qtHaveModule(quick): SUBDIRS += quick quickcontrols
diff --git a/examples/quickcontrols/quickcontrols2.pro b/examples/quickcontrols/quickcontrols.pro
index b7fc57bca6..b7fc57bca6 100644
--- a/examples/quickcontrols/quickcontrols2.pro
+++ b/examples/quickcontrols/quickcontrols.pro