aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/CMakeLists.txt1
-rw-r--r--examples/examples.pro2
-rw-r--r--examples/quick/CMakeLists.txt2
-rw-r--r--examples/quick/quick.pro1
-rw-r--r--examples/quickshapes/CMakeLists.txt17
-rw-r--r--examples/quickshapes/quickshapes.pro2
-rw-r--r--examples/quickshapes/shapes/CMakeLists.txt (renamed from examples/quick/shapes/CMakeLists.txt)4
-rw-r--r--examples/quickshapes/shapes/arcDirection.qml (renamed from examples/quick/shapes/arcDirection.qml)0
-rw-r--r--examples/quickshapes/shapes/arcRotation.qml (renamed from examples/quick/shapes/arcRotation.qml)0
-rw-r--r--examples/quickshapes/shapes/capStyles.qml (renamed from examples/quick/shapes/capStyles.qml)0
-rw-r--r--examples/quickshapes/shapes/clippedtigers.qml (renamed from examples/quick/shapes/clippedtigers.qml)0
-rw-r--r--examples/quickshapes/shapes/cubicCurve.qml (renamed from examples/quick/shapes/cubicCurve.qml)0
-rw-r--r--examples/quickshapes/shapes/dashPattern.qml (renamed from examples/quick/shapes/dashPattern.qml)0
-rw-r--r--examples/quickshapes/shapes/doc/images/qml-shapes-example.png (renamed from examples/quick/shapes/doc/images/qml-shapes-example.png)bin49261 -> 49261 bytes
-rw-r--r--examples/quickshapes/shapes/doc/src/shapes.qdoc (renamed from examples/quick/shapes/doc/src/shapes.qdoc)0
-rw-r--r--examples/quickshapes/shapes/ellipticalArcs.qml (renamed from examples/quick/shapes/ellipticalArcs.qml)0
-rw-r--r--examples/quickshapes/shapes/fillRules.qml (renamed from examples/quick/shapes/fillRules.qml)0
-rw-r--r--examples/quickshapes/shapes/gradientSpreadModes.qml (renamed from examples/quick/shapes/gradientSpreadModes.qml)0
-rw-r--r--examples/quickshapes/shapes/interactive.qml (renamed from examples/quick/shapes/interactive.qml)0
-rw-r--r--examples/quickshapes/shapes/joinStyles.qml (renamed from examples/quick/shapes/joinStyles.qml)0
-rw-r--r--examples/quickshapes/shapes/largeOrSmallArc.qml (renamed from examples/quick/shapes/largeOrSmallArc.qml)0
-rw-r--r--examples/quickshapes/shapes/linearGradient.qml (renamed from examples/quick/shapes/linearGradient.qml)0
-rw-r--r--examples/quickshapes/shapes/main.cpp (renamed from examples/quick/shapes/main.cpp)2
-rw-r--r--examples/quickshapes/shapes/main.qml (renamed from examples/quick/shapes/main.qml)0
-rw-r--r--examples/quickshapes/shapes/quadraticCurve.qml (renamed from examples/quick/shapes/quadraticCurve.qml)0
-rw-r--r--examples/quickshapes/shapes/radialGradient.qml (renamed from examples/quick/shapes/radialGradient.qml)0
-rw-r--r--examples/quickshapes/shapes/sampling.qml (renamed from examples/quick/shapes/sampling.qml)0
-rw-r--r--examples/quickshapes/shapes/shapegallery.qml (renamed from examples/quick/shapes/shapegallery.qml)0
-rw-r--r--examples/quickshapes/shapes/shapes.pro (renamed from examples/quick/shapes/shapes.pro)4
-rw-r--r--examples/quickshapes/shapes/shapes.qrc (renamed from examples/quick/shapes/shapes.qrc)0
-rw-r--r--examples/quickshapes/shapes/strokeOrFill.qml (renamed from examples/quick/shapes/strokeOrFill.qml)0
-rw-r--r--examples/quickshapes/shapes/tapableTriangle.qml (renamed from examples/quick/shapes/tapableTriangle.qml)0
-rw-r--r--examples/quickshapes/shapes/text.qml (renamed from examples/quick/shapes/text.qml)0
-rw-r--r--examples/quickshapes/shapes/tiger.qml (renamed from examples/quick/shapes/tiger.qml)0
-rw-r--r--examples/quickshapes/shapes/tigerLoader.qml (renamed from examples/quick/shapes/tigerLoader.qml)0
-rw-r--r--examples/quickshapes/shapes/zoomtiger.qml (renamed from examples/quick/shapes/zoomtiger.qml)0
36 files changed, 26 insertions, 9 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 6d80d3a5d3..5fde502f51 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -6,6 +6,7 @@ qt_examples_build_begin(EXTERNAL_BUILD)
add_subdirectory(qml)
if(TARGET Qt6::Quick)
add_subdirectory(quick)
+ add_subdirectory(quickshapes)
endif()
if(TARGET Qt6::QuickTemplates2)
add_subdirectory(quickcontrols)
diff --git a/examples/examples.pro b/examples/examples.pro
index b73064e0c7..711becc5fe 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS += qml
-qtHaveModule(quick): SUBDIRS += quick quickcontrols
+qtHaveModule(quick): SUBDIRS += quick quickcontrols quickshapes
diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt
index 0ed9871e68..a91f108386 100644
--- a/examples/quick/CMakeLists.txt
+++ b/examples/quick/CMakeLists.txt
@@ -24,7 +24,6 @@ qt_internal_add_example(imageprovider)
qt_internal_add_example(imageresponseprovider)
qt_internal_add_example(window)
add_subdirectory(particles)
-qt_internal_add_example(shapes)
qt_internal_add_example(itemvariablerefreshrate)
add_subdirectory(multieffect)
if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
@@ -46,7 +45,6 @@ set(reused_dir_targets
positioners_shared
text_shared
window_shared
- shapes_shared
imageelements_shared
pointerhandlers_shared
affectors_shared
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index 7c07f69af9..70e2accc33 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -23,7 +23,6 @@ SUBDIRS = quick-accessibility \
imageresponseprovider \
window \
particles \
- shapes \
itemvariablerefreshrate \
multieffect
diff --git a/examples/quickshapes/CMakeLists.txt b/examples/quickshapes/CMakeLists.txt
new file mode 100644
index 0000000000..b328c0e258
--- /dev/null
+++ b/examples/quickshapes/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+qt_internal_add_example(shapes)
+
+# qt_examples_build_end() misses at least some of these due to some
+# source subdirectories being added multiple times. See QTBUG-96159.
+set(reused_dir_targets shapes_shared)
+
+foreach(target IN LISTS reused_dir_targets)
+ if(TARGET ${target})
+ qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS moc rcc)
+ if(TARGET Qt6::Widgets)
+ qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS uic)
+ endif()
+ endif()
+endforeach()
diff --git a/examples/quickshapes/quickshapes.pro b/examples/quickshapes/quickshapes.pro
new file mode 100644
index 0000000000..c2071244a8
--- /dev/null
+++ b/examples/quickshapes/quickshapes.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = shapes
diff --git a/examples/quick/shapes/CMakeLists.txt b/examples/quickshapes/shapes/CMakeLists.txt
index ea9df6818a..351baa5267 100644
--- a/examples/quick/shapes/CMakeLists.txt
+++ b/examples/quickshapes/shapes/CMakeLists.txt
@@ -8,13 +8,13 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
set(INSTALL_EXAMPLESDIR "examples")
endif()
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/shapes")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickshapes/shapes")
find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
qt_standard_project_setup(REQUIRES 6.5)
-add_subdirectory("../shared" "shared")
+add_subdirectory("../../quick/shared" "shared")
qt_add_executable(shapesexample
WIN32
diff --git a/examples/quick/shapes/arcDirection.qml b/examples/quickshapes/shapes/arcDirection.qml
index 60ec181380..60ec181380 100644
--- a/examples/quick/shapes/arcDirection.qml
+++ b/examples/quickshapes/shapes/arcDirection.qml
diff --git a/examples/quick/shapes/arcRotation.qml b/examples/quickshapes/shapes/arcRotation.qml
index 2433280698..2433280698 100644
--- a/examples/quick/shapes/arcRotation.qml
+++ b/examples/quickshapes/shapes/arcRotation.qml
diff --git a/examples/quick/shapes/capStyles.qml b/examples/quickshapes/shapes/capStyles.qml
index 7fc7a4e2b9..7fc7a4e2b9 100644
--- a/examples/quick/shapes/capStyles.qml
+++ b/examples/quickshapes/shapes/capStyles.qml
diff --git a/examples/quick/shapes/clippedtigers.qml b/examples/quickshapes/shapes/clippedtigers.qml
index 8885f60dd7..8885f60dd7 100644
--- a/examples/quick/shapes/clippedtigers.qml
+++ b/examples/quickshapes/shapes/clippedtigers.qml
diff --git a/examples/quick/shapes/cubicCurve.qml b/examples/quickshapes/shapes/cubicCurve.qml
index 3fa4ed6f4b..3fa4ed6f4b 100644
--- a/examples/quick/shapes/cubicCurve.qml
+++ b/examples/quickshapes/shapes/cubicCurve.qml
diff --git a/examples/quick/shapes/dashPattern.qml b/examples/quickshapes/shapes/dashPattern.qml
index 742f8622e9..742f8622e9 100644
--- a/examples/quick/shapes/dashPattern.qml
+++ b/examples/quickshapes/shapes/dashPattern.qml
diff --git a/examples/quick/shapes/doc/images/qml-shapes-example.png b/examples/quickshapes/shapes/doc/images/qml-shapes-example.png
index 055fc244ea..055fc244ea 100644
--- a/examples/quick/shapes/doc/images/qml-shapes-example.png
+++ b/examples/quickshapes/shapes/doc/images/qml-shapes-example.png
Binary files differ
diff --git a/examples/quick/shapes/doc/src/shapes.qdoc b/examples/quickshapes/shapes/doc/src/shapes.qdoc
index 57ab7ea383..57ab7ea383 100644
--- a/examples/quick/shapes/doc/src/shapes.qdoc
+++ b/examples/quickshapes/shapes/doc/src/shapes.qdoc
diff --git a/examples/quick/shapes/ellipticalArcs.qml b/examples/quickshapes/shapes/ellipticalArcs.qml
index d2b65cb4c1..d2b65cb4c1 100644
--- a/examples/quick/shapes/ellipticalArcs.qml
+++ b/examples/quickshapes/shapes/ellipticalArcs.qml
diff --git a/examples/quick/shapes/fillRules.qml b/examples/quickshapes/shapes/fillRules.qml
index 1e96af94e7..1e96af94e7 100644
--- a/examples/quick/shapes/fillRules.qml
+++ b/examples/quickshapes/shapes/fillRules.qml
diff --git a/examples/quick/shapes/gradientSpreadModes.qml b/examples/quickshapes/shapes/gradientSpreadModes.qml
index ba2dc2b734..ba2dc2b734 100644
--- a/examples/quick/shapes/gradientSpreadModes.qml
+++ b/examples/quickshapes/shapes/gradientSpreadModes.qml
diff --git a/examples/quick/shapes/interactive.qml b/examples/quickshapes/shapes/interactive.qml
index 0525f4eed3..0525f4eed3 100644
--- a/examples/quick/shapes/interactive.qml
+++ b/examples/quickshapes/shapes/interactive.qml
diff --git a/examples/quick/shapes/joinStyles.qml b/examples/quickshapes/shapes/joinStyles.qml
index 127cb50fbe..127cb50fbe 100644
--- a/examples/quick/shapes/joinStyles.qml
+++ b/examples/quickshapes/shapes/joinStyles.qml
diff --git a/examples/quick/shapes/largeOrSmallArc.qml b/examples/quickshapes/shapes/largeOrSmallArc.qml
index 0d887d162d..0d887d162d 100644
--- a/examples/quick/shapes/largeOrSmallArc.qml
+++ b/examples/quickshapes/shapes/largeOrSmallArc.qml
diff --git a/examples/quick/shapes/linearGradient.qml b/examples/quickshapes/shapes/linearGradient.qml
index cb89be7e6b..cb89be7e6b 100644
--- a/examples/quick/shapes/linearGradient.qml
+++ b/examples/quickshapes/shapes/linearGradient.qml
diff --git a/examples/quick/shapes/main.cpp b/examples/quickshapes/shapes/main.cpp
index 1679876d37..4114c3f388 100644
--- a/examples/quick/shapes/main.cpp
+++ b/examples/quickshapes/shapes/main.cpp
@@ -1,4 +1,4 @@
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-#include "../shared/shared.h"
+#include "../../quick/shared/shared.h"
DECLARATIVE_EXAMPLE_MAIN(shapes/main)
diff --git a/examples/quick/shapes/main.qml b/examples/quickshapes/shapes/main.qml
index ddd6e4edf0..ddd6e4edf0 100644
--- a/examples/quick/shapes/main.qml
+++ b/examples/quickshapes/shapes/main.qml
diff --git a/examples/quick/shapes/quadraticCurve.qml b/examples/quickshapes/shapes/quadraticCurve.qml
index d626d2693a..d626d2693a 100644
--- a/examples/quick/shapes/quadraticCurve.qml
+++ b/examples/quickshapes/shapes/quadraticCurve.qml
diff --git a/examples/quick/shapes/radialGradient.qml b/examples/quickshapes/shapes/radialGradient.qml
index 87db319c9a..87db319c9a 100644
--- a/examples/quick/shapes/radialGradient.qml
+++ b/examples/quickshapes/shapes/radialGradient.qml
diff --git a/examples/quick/shapes/sampling.qml b/examples/quickshapes/shapes/sampling.qml
index ef922ed5f2..ef922ed5f2 100644
--- a/examples/quick/shapes/sampling.qml
+++ b/examples/quickshapes/shapes/sampling.qml
diff --git a/examples/quick/shapes/shapegallery.qml b/examples/quickshapes/shapes/shapegallery.qml
index 74059b8208..74059b8208 100644
--- a/examples/quick/shapes/shapegallery.qml
+++ b/examples/quickshapes/shapes/shapegallery.qml
diff --git a/examples/quick/shapes/shapes.pro b/examples/quickshapes/shapes/shapes.pro
index eb2baae0b4..397b29bf11 100644
--- a/examples/quick/shapes/shapes.pro
+++ b/examples/quickshapes/shapes/shapes.pro
@@ -4,7 +4,7 @@ QT += quick qml
SOURCES += main.cpp
RESOURCES += \
shapes.qrc \
- ../shared/shared.qrc
+ ../../quick/shared/shared.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/quick/shapes
+target.path = $$[QT_INSTALL_EXAMPLES]/quickshapes/shapes
INSTALLS += target
diff --git a/examples/quick/shapes/shapes.qrc b/examples/quickshapes/shapes/shapes.qrc
index 413816dba2..413816dba2 100644
--- a/examples/quick/shapes/shapes.qrc
+++ b/examples/quickshapes/shapes/shapes.qrc
diff --git a/examples/quick/shapes/strokeOrFill.qml b/examples/quickshapes/shapes/strokeOrFill.qml
index c939ed067d..c939ed067d 100644
--- a/examples/quick/shapes/strokeOrFill.qml
+++ b/examples/quickshapes/shapes/strokeOrFill.qml
diff --git a/examples/quick/shapes/tapableTriangle.qml b/examples/quickshapes/shapes/tapableTriangle.qml
index c76821e898..c76821e898 100644
--- a/examples/quick/shapes/tapableTriangle.qml
+++ b/examples/quickshapes/shapes/tapableTriangle.qml
diff --git a/examples/quick/shapes/text.qml b/examples/quickshapes/shapes/text.qml
index 8a105fb254..8a105fb254 100644
--- a/examples/quick/shapes/text.qml
+++ b/examples/quickshapes/shapes/text.qml
diff --git a/examples/quick/shapes/tiger.qml b/examples/quickshapes/shapes/tiger.qml
index 40fcaf7fc2..40fcaf7fc2 100644
--- a/examples/quick/shapes/tiger.qml
+++ b/examples/quickshapes/shapes/tiger.qml
diff --git a/examples/quick/shapes/tigerLoader.qml b/examples/quickshapes/shapes/tigerLoader.qml
index e49d33a828..e49d33a828 100644
--- a/examples/quick/shapes/tigerLoader.qml
+++ b/examples/quickshapes/shapes/tigerLoader.qml
diff --git a/examples/quick/shapes/zoomtiger.qml b/examples/quickshapes/shapes/zoomtiger.qml
index fb79042dd8..fb79042dd8 100644
--- a/examples/quick/shapes/zoomtiger.qml
+++ b/examples/quickshapes/shapes/zoomtiger.qml
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 03:43:50 +0000