aboutsummaryrefslogtreecommitdiffstats
path: root/examples/qml/referenceexamples/adding
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-08-22 11:45:45 +0200
committerLeander Beernaert <leander.beernaert@qt.io>2019-08-23 13:51:06 +0000
commitb938edcfb3aa2c78e35c9d63d995f6824e14eadf (patch)
tree593a1eb2158d47b67d422259721198956d9f9a7f /examples/qml/referenceexamples/adding
parent2be575b4b1e6f6e11a8dbd0b1c05c003828d2598 (diff)
Convert Examples
This patch converts all examples in qtdeclarative except for a few exceptions which require a public facing qml plugin api. Change-Id: I2cd2b1bb455be8b48796893a8235dea7f8b35aa2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/qml/referenceexamples/adding')
-rw-r--r--examples/qml/referenceexamples/adding/CMakeLists.txt52
1 files changed, 37 insertions, 15 deletions
diff --git a/examples/qml/referenceexamples/adding/CMakeLists.txt b/examples/qml/referenceexamples/adding/CMakeLists.txt
index 5f2b272d3f..4febb6fb06 100644
--- a/examples/qml/referenceexamples/adding/CMakeLists.txt
+++ b/examples/qml/referenceexamples/adding/CMakeLists.txt
@@ -1,21 +1,43 @@
# Generated from adding.pro.
-#####################################################################
-## adding Binary:
-#####################################################################
-
-add_qt_executable(adding
- GUI
- OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/qml/referenceexamples/adding"
- INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/qml/referenceexamples/adding"
- SOURCES
- main.cpp
- person.cpp person.h
- PUBLIC_LIBRARIES
- Qt::Qml
+cmake_minimum_required(VERSION 3.14)
+project(adding LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Qml)
+
+add_qt_gui_executable(adding
+ main.cpp
+ person.cpp person.h
+)
+target_link_libraries(adding PUBLIC
+ Qt::Core
+ Qt::Qml
)
# Resources:
-add_qt_resource(adding "adding" FILES
- example.qml)
+set(adding_resource_files
+ "example.qml"
+)
+
+QT6_ADD_RESOURCES(adding "adding"
+ PREFIX
+ "/"
+ FILES
+ ${adding_resource_files}
+)
+
+install(TARGETS adding
+ RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+ BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+ LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)