summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2020-04-28 10:44:54 +0200
committerSona Kurazyan <sona.kurazyan@qt.io>2020-04-29 22:48:38 +0200
commit9b51d5f5713c237c244c1bff4d0bd3d0437e1b95 (patch)
tree5970f713d6264edfd2961439f027b62da2077d73
parenta19d743b2cf61bbfebec8f56bfd09299c30f00a8 (diff)
CMake: Regenerate examples/widgets/ projects
Also add the missing examples/widgets/gallery project. Change-Id: Iec3d61881065cf93d90f9fd3da928ffcd4f0c0aa Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--examples/widgets/.prev_CMakeLists.txt36
-rw-r--r--examples/widgets/CMakeLists.txt23
-rw-r--r--examples/widgets/dialogs/.prev_CMakeLists.txt13
-rw-r--r--examples/widgets/dialogs/CMakeLists.txt13
-rw-r--r--examples/widgets/gallery/CMakeLists.txt32
-rw-r--r--examples/widgets/gestures/CMakeLists.txt3
-rw-r--r--examples/widgets/graphicsview/CMakeLists.txt6
-rw-r--r--examples/widgets/itemviews/.prev_CMakeLists.txt27
-rw-r--r--examples/widgets/itemviews/CMakeLists.txt12
-rw-r--r--examples/widgets/mac/CMakeLists.txt1
-rw-r--r--examples/widgets/painting/.prev_CMakeLists.txt13
-rw-r--r--examples/widgets/painting/CMakeLists.txt2
-rw-r--r--examples/widgets/statemachine/CMakeLists.txt1
-rw-r--r--examples/widgets/tools/plugandpaint/CMakeLists.txt3
-rw-r--r--examples/widgets/tools/styleplugin/.prev_CMakeLists.txt4
-rw-r--r--examples/widgets/touch/CMakeLists.txt3
16 files changed, 163 insertions, 29 deletions
diff --git a/examples/widgets/.prev_CMakeLists.txt b/examples/widgets/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..8eca336c88
--- /dev/null
+++ b/examples/widgets/.prev_CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from widgets.pro.
+
+if(NOT TARGET Qt::Widgets)
+ return()
+endif()
+if(QT_FEATURE_animation)
+ add_subdirectory(animation)
+endif()
+add_subdirectory(desktop)
+add_subdirectory(dialogs)
+add_subdirectory(effects)
+add_subdirectory(gallery)
+add_subdirectory(gestures)
+add_subdirectory(graphicsview)
+add_subdirectory(itemviews)
+add_subdirectory(layouts)
+add_subdirectory(painting)
+add_subdirectory(richtext)
+add_subdirectory(scroller)
+add_subdirectory(statemachine)
+add_subdirectory(tools)
+add_subdirectory(touch)
+add_subdirectory(tutorials)
+add_subdirectory(widgets)
+if(QT_FEATURE_draganddrop)
+ add_subdirectory(draganddrop)
+endif()
+if(QT_FEATURE_cursor)
+ add_subdirectory(mainwindows)
+endif()
+if(QT_FEATURE_opengl AND TARGET Qt::Gui)
+ add_subdirectory(windowcontainer)
+endif()
+if(APPLE)
+ add_subdirectory(mac)
+endif()
diff --git a/examples/widgets/CMakeLists.txt b/examples/widgets/CMakeLists.txt
index a710f75207..12f944de11 100644
--- a/examples/widgets/CMakeLists.txt
+++ b/examples/widgets/CMakeLists.txt
@@ -1,12 +1,15 @@
# Generated from widgets.pro.
-add_subdirectory(animation)
+if(NOT TARGET Qt::Widgets)
+ return()
+endif()
+if(QT_FEATURE_animation)
+ add_subdirectory(animation)
+endif()
add_subdirectory(desktop)
add_subdirectory(dialogs)
-if(QT_FEATURE_draganddrop) # special case
- add_subdirectory(draganddrop)
-endif()
add_subdirectory(effects)
+add_subdirectory(gallery)
add_subdirectory(gestures)
add_subdirectory(graphicsview)
add_subdirectory(itemviews)
@@ -19,15 +22,15 @@ add_subdirectory(tools)
add_subdirectory(touch)
add_subdirectory(tutorials)
add_subdirectory(widgets)
-
-if(TARGET Qt::Gui AND QT_FEATURE_opengl)
- add_subdirectory(windowcontainer)
+if(QT_FEATURE_draganddrop)
+ add_subdirectory(draganddrop)
endif()
-
if(QT_FEATURE_cursor) # special case
add_subdirectory(mainwindows)
endif()
-
-if(MACOS)
+if(QT_FEATURE_opengl AND TARGET Qt::Gui)
+ add_subdirectory(windowcontainer)
+endif()
+if(APPLE)
add_subdirectory(mac)
endif()
diff --git a/examples/widgets/dialogs/.prev_CMakeLists.txt b/examples/widgets/dialogs/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..354424bf1f
--- /dev/null
+++ b/examples/widgets/dialogs/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from dialogs.pro.
+
+if(QT_FEATURE_wizard)
+ add_subdirectory(classwizard)
+ add_subdirectory(trivialwizard)
+endif()
+add_subdirectory(extension)
+add_subdirectory(findfiles)
+add_subdirectory(standarddialogs)
+add_subdirectory(tabdialog)
+if(QT_FEATURE_wizard AND TARGET Qt::PrintSupport)
+ add_subdirectory(licensewizard)
+endif()
diff --git a/examples/widgets/dialogs/CMakeLists.txt b/examples/widgets/dialogs/CMakeLists.txt
index c9d6823adc..354424bf1f 100644
--- a/examples/widgets/dialogs/CMakeLists.txt
+++ b/examples/widgets/dialogs/CMakeLists.txt
@@ -1,14 +1,13 @@
# Generated from dialogs.pro.
+if(QT_FEATURE_wizard)
+ add_subdirectory(classwizard)
+ add_subdirectory(trivialwizard)
+endif()
add_subdirectory(extension)
add_subdirectory(findfiles)
-if(TARGET Qt::PrintSupport AND QT_FEATURE_wizard) # special case
- add_subdirectory(licensewizard)
-endif()
add_subdirectory(standarddialogs)
add_subdirectory(tabdialog)
-
-if(QT_FEATURE_wizard) # special case
- add_subdirectory(classwizard)
- add_subdirectory(trivialwizard)
+if(QT_FEATURE_wizard AND TARGET Qt::PrintSupport)
+ add_subdirectory(licensewizard)
endif()
diff --git a/examples/widgets/gallery/CMakeLists.txt b/examples/widgets/gallery/CMakeLists.txt
new file mode 100644
index 0000000000..67e2a6bede
--- /dev/null
+++ b/examples/widgets/gallery/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from gallery.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(gallery LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/widgets/gallery")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(gallery
+ main.cpp
+ widgetgallery.cpp widgetgallery.h
+)
+target_link_libraries(gallery PUBLIC
+ Qt::Core
+ Qt::Gui
+ Qt::Widgets
+)
+
+install(TARGETS gallery
+ RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+ BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+ LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/widgets/gestures/CMakeLists.txt b/examples/widgets/gestures/CMakeLists.txt
index 0f9f95b72f..eb02ee41a9 100644
--- a/examples/widgets/gestures/CMakeLists.txt
+++ b/examples/widgets/gestures/CMakeLists.txt
@@ -1,3 +1,6 @@
# Generated from gestures.pro.
+if(NOT TARGET Qt::Widgets)
+ return()
+endif()
add_subdirectory(imagegestures)
diff --git a/examples/widgets/graphicsview/CMakeLists.txt b/examples/widgets/graphicsview/CMakeLists.txt
index d7ef0fd0dc..5ea8d6b2c6 100644
--- a/examples/widgets/graphicsview/CMakeLists.txt
+++ b/examples/widgets/graphicsview/CMakeLists.txt
@@ -7,10 +7,10 @@ add_subdirectory(collidingmice)
add_subdirectory(padnavigator)
add_subdirectory(basicgraphicslayouts)
add_subdirectory(diagramscene)
-if(QT_FEATURE_cursor AND QT_FEATURE_draganddrop)
- add_subdirectory(dragdroprobot)
-endif()
add_subdirectory(flowlayout)
add_subdirectory(anchorlayout)
add_subdirectory(simpleanchorlayout)
add_subdirectory(weatheranchorlayout)
+if(QT_FEATURE_cursor AND QT_FEATURE_draganddrop)
+ add_subdirectory(dragdroprobot)
+endif()
diff --git a/examples/widgets/itemviews/.prev_CMakeLists.txt b/examples/widgets/itemviews/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..96f03a2e61
--- /dev/null
+++ b/examples/widgets/itemviews/.prev_CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from itemviews.pro.
+
+add_subdirectory(addressbook)
+add_subdirectory(basicsortfiltermodel)
+add_subdirectory(chart)
+add_subdirectory(coloreditorfactory)
+add_subdirectory(combowidgetmapper)
+add_subdirectory(customsortfiltermodel)
+add_subdirectory(dirview)
+add_subdirectory(editabletreemodel)
+add_subdirectory(fetchmore)
+add_subdirectory(flattreeview)
+add_subdirectory(frozencolumn)
+add_subdirectory(interview)
+add_subdirectory(pixelator)
+add_subdirectory(simpletreemodel)
+add_subdirectory(simplewidgetmapper)
+add_subdirectory(spinboxdelegate)
+add_subdirectory(spreadsheet)
+add_subdirectory(stardelegate)
+add_subdirectory(storageview)
+if(QT_FEATURE_draganddrop)
+ add_subdirectory(puzzle)
+endif()
+if(TARGET Qt::Xml)
+ add_subdirectory(simpledommodel)
+endif()
diff --git a/examples/widgets/itemviews/CMakeLists.txt b/examples/widgets/itemviews/CMakeLists.txt
index a1bd0c4dca..96f03a2e61 100644
--- a/examples/widgets/itemviews/CMakeLists.txt
+++ b/examples/widgets/itemviews/CMakeLists.txt
@@ -13,15 +13,15 @@ add_subdirectory(flattreeview)
add_subdirectory(frozencolumn)
add_subdirectory(interview)
add_subdirectory(pixelator)
-if(QT_FEATURE_draganddrop) # special case
- add_subdirectory(puzzle)
-endif()
-if(TARGET Qt::Xml) # special case
- add_subdirectory(simpledommodel)
-endif()
add_subdirectory(simpletreemodel)
add_subdirectory(simplewidgetmapper)
add_subdirectory(spinboxdelegate)
add_subdirectory(spreadsheet)
add_subdirectory(stardelegate)
add_subdirectory(storageview)
+if(QT_FEATURE_draganddrop)
+ add_subdirectory(puzzle)
+endif()
+if(TARGET Qt::Xml)
+ add_subdirectory(simpledommodel)
+endif()
diff --git a/examples/widgets/mac/CMakeLists.txt b/examples/widgets/mac/CMakeLists.txt
index 39003dc4c8..c040da3f61 100644
--- a/examples/widgets/mac/CMakeLists.txt
+++ b/examples/widgets/mac/CMakeLists.txt
@@ -1,6 +1,5 @@
# Generated from mac.pro.
-
if(MACOS)
add_subdirectory(qmaccocoaviewcontainer)
add_subdirectory(qmacnativewidget)
diff --git a/examples/widgets/painting/.prev_CMakeLists.txt b/examples/widgets/painting/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..2ef5da303a
--- /dev/null
+++ b/examples/widgets/painting/.prev_CMakeLists.txt
@@ -0,0 +1,13 @@
+# Generated from painting.pro.
+
+add_subdirectory(basicdrawing)
+add_subdirectory(concentriccircles)
+add_subdirectory(affine)
+add_subdirectory(composition)
+add_subdirectory(deform)
+add_subdirectory(gradients)
+add_subdirectory(pathstroke)
+add_subdirectory(imagecomposition)
+add_subdirectory(painterpaths)
+add_subdirectory(transformations)
+add_subdirectory(fontsampler)
diff --git a/examples/widgets/painting/CMakeLists.txt b/examples/widgets/painting/CMakeLists.txt
index e7d612da3b..8a106982cf 100644
--- a/examples/widgets/painting/CMakeLists.txt
+++ b/examples/widgets/painting/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(shared) # special case
add_subdirectory(basicdrawing)
add_subdirectory(concentriccircles)
add_subdirectory(affine)
-# add_subdirectory(composition) # FIXME: Seems buggy wrt. usesOpenGL function
+# add_subdirectory(composition) # special case FIXME: Seems buggy wrt. usesOpenGL function
add_subdirectory(deform)
add_subdirectory(gradients)
add_subdirectory(pathstroke)
diff --git a/examples/widgets/statemachine/CMakeLists.txt b/examples/widgets/statemachine/CMakeLists.txt
index 8527fcbc69..90a7b3e263 100644
--- a/examples/widgets/statemachine/CMakeLists.txt
+++ b/examples/widgets/statemachine/CMakeLists.txt
@@ -2,7 +2,6 @@
add_subdirectory(factorial)
add_subdirectory(pingpong)
-
if(TARGET Qt::Widgets)
add_subdirectory(eventtransitions)
add_subdirectory(rogue)
diff --git a/examples/widgets/tools/plugandpaint/CMakeLists.txt b/examples/widgets/tools/plugandpaint/CMakeLists.txt
index 2bde4718b2..4e35d0d0c3 100644
--- a/examples/widgets/tools/plugandpaint/CMakeLists.txt
+++ b/examples/widgets/tools/plugandpaint/CMakeLists.txt
@@ -1,4 +1,7 @@
# Generated from plugandpaint.pro.
+if(NOT QT_FEATURE_inputdialog)
+ return()
+endif()
add_subdirectory(plugins)
add_subdirectory(app)
diff --git a/examples/widgets/tools/styleplugin/.prev_CMakeLists.txt b/examples/widgets/tools/styleplugin/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..630c3703f8
--- /dev/null
+++ b/examples/widgets/tools/styleplugin/.prev_CMakeLists.txt
@@ -0,0 +1,4 @@
+# Generated from styleplugin.pro.
+
+add_subdirectory(stylewindow)
+add_subdirectory(plugin)
diff --git a/examples/widgets/touch/CMakeLists.txt b/examples/widgets/touch/CMakeLists.txt
index 06b72cada7..d2c3152ad8 100644
--- a/examples/widgets/touch/CMakeLists.txt
+++ b/examples/widgets/touch/CMakeLists.txt
@@ -1,5 +1,8 @@
# Generated from touch.pro.
+if(NOT TARGET Qt::Widgets)
+ return()
+endif()
add_subdirectory(pinchzoom)
add_subdirectory(fingerpaint)
add_subdirectory(knobs)