summaryrefslogtreecommitdiffstats
path: root/examples/demos/photoviewer
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-12-09 17:54:11 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-12-09 19:59:12 +0100
commit0843dcec651d50687a9fada14a30bc80c1860473 (patch)
tree43a5ea6f5824501e83f8f8837d0060a412926858 /examples/demos/photoviewer
parentb6b64df2643fcce139f4d272015879360ca18e1f (diff)
CMake: Regenerate projects using pro2cmake one last time
Pick-to: 6.0 Change-Id: I63976c150c1eeeffa0be35783d7cfd6e7e757b06 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/demos/photoviewer')
-rw-r--r--examples/demos/photoviewer/CMakeLists.txt24
1 files changed, 11 insertions, 13 deletions
diff --git a/examples/demos/photoviewer/CMakeLists.txt b/examples/demos/photoviewer/CMakeLists.txt
index 15cdb5d0d..b0a8bb1f8 100644
--- a/examples/demos/photoviewer/CMakeLists.txt
+++ b/examples/demos/photoviewer/CMakeLists.txt
@@ -19,35 +19,26 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
-find_package(Qt6 COMPONENTS QuickControls2 REQUIRED)
-find_package(Qt6 COMPONENTS Network)
qt_add_executable(photoviewer
+ ../shared/xmllistmodel.cpp ../shared/xmllistmodel.h
main.cpp
- ../shared/xmllistmodel.cpp
- ../shared/xmllistmodel.h
)
-
set_target_properties(photoviewer PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
- QT_QML_MODULE_VERSION 1.0
- QT_QML_MODULE_URI XmlListModel
)
-qt6_qml_type_registration(photoviewer)
+target_include_directories(photoviewer PUBLIC
+ ../shared
+)
target_link_libraries(photoviewer PUBLIC
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
- Qt::Network
- Qt::QuickControls2
)
-target_include_directories(photoviewer PUBLIC
- ../shared
-)
# Resources:
set(qmake_immediate_resource_files
@@ -86,3 +77,10 @@ install(TARGETS photoviewer
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
)
+
+set_target_properties(photoviewer PROPERTIES
+ QT_QML_MODULE_VERSION 1.0
+ QT_QML_MODULE_URI XmlListModel
+)
+
+qt6_qml_type_registration(photoviewer)