aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-11-14 18:27:59 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-15 12:22:59 +0000
commit5e6bf7e22eb3734aa711e9dd885bc5c594f7db4c (patch)
treefac78a35d68786be46b61b0c8d961f76bb0d4ab4 /examples
parent6f617349cf865ca3a7befc0dd472b7c2510fc431 (diff)
Regenerate projects to be in sync
Change-Id: I3a57449c9025e22414b8337fcffdeb0f4d769af2 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/quickcontrols2/chattutorial/chapter1-settingup/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/contactlist/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/flatstyle/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/gallery/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/imagine/automotive/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/sidepanel/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/swipetoremove/CMakeLists.txt2
-rw-r--r--examples/quickcontrols2/texteditor/CMakeLists.txt4
-rw-r--r--examples/quickcontrols2/wearable/CMakeLists.txt2
14 files changed, 14 insertions, 16 deletions
diff --git a/examples/quickcontrols2/chattutorial/chapter1-settingup/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter1-settingup/CMakeLists.txt
index 13ad4ced..90f06968 100644
--- a/examples/quickcontrols2/chattutorial/chapter1-settingup/CMakeLists.txt
+++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(chapter1-settingup PUBLIC
Qt::Quick
)
+
# Resources:
set(qml_resource_files
"main.qml"
@@ -38,7 +39,6 @@ qt6_add_resources(chapter1-settingup "qml"
${qml_resource_files}
)
-
install(TARGETS chapter1-settingup
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt
index a1f36919..1d4d124d 100644
--- a/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt
+++ b/examples/quickcontrols2/chattutorial/chapter2-lists/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(chapter2-lists PUBLIC
Qt::Quick
)
+
# Resources:
set(qml_resource_files
"main.qml"
@@ -97,7 +98,6 @@ qt6_add_resources(chapter2-lists "shared"
${shared_resource_files}
)
-
install(TARGETS chapter2-lists
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt
index 5968253b..9b405c47 100644
--- a/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(chapter3-navigation PUBLIC
Qt::Quick
)
+
# Resources:
set(qml_resource_files
"ContactPage.qml"
@@ -99,7 +100,6 @@ qt6_add_resources(chapter3-navigation "shared"
${shared_resource_files}
)
-
install(TARGETS chapter3-navigation
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt
index 400da7f9..dfccc0ca 100644
--- a/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/CMakeLists.txt
@@ -30,6 +30,7 @@ target_link_libraries(chapter4-models PUBLIC
Qt::Sql
)
+
# Resources:
set(qml_resource_files
"ContactPage.qml"
@@ -103,7 +104,6 @@ qt6_add_resources(chapter4-models "shared"
${shared_resource_files}
)
-
install(TARGETS chapter4-models
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt b/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt
index beeba245..73b493d1 100644
--- a/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/CMakeLists.txt
@@ -30,6 +30,7 @@ target_link_libraries(chapter5-styling PUBLIC
Qt::Sql
)
+
# Resources:
set(qml_resource_files
"+material/ChatToolBar.qml"
@@ -106,7 +107,6 @@ qt6_add_resources(chapter5-styling "shared"
${shared_resource_files}
)
-
install(TARGETS chapter5-styling
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/contactlist/CMakeLists.txt b/examples/quickcontrols2/contactlist/CMakeLists.txt
index 381b5e22..ee2a020f 100644
--- a/examples/quickcontrols2/contactlist/CMakeLists.txt
+++ b/examples/quickcontrols2/contactlist/CMakeLists.txt
@@ -25,6 +25,7 @@ target_link_libraries(contactlist PUBLIC
Qt::Quick
)
+
# Resources:
set(qmake_immediate_resource_files
"ContactDelegate.ui.qml"
@@ -43,7 +44,6 @@ qt6_add_resources(contactlist "qmake_immediate"
${qmake_immediate_resource_files}
)
-
install(TARGETS contactlist
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/flatstyle/CMakeLists.txt b/examples/quickcontrols2/flatstyle/CMakeLists.txt
index aff7e1a0..54b84b38 100644
--- a/examples/quickcontrols2/flatstyle/CMakeLists.txt
+++ b/examples/quickcontrols2/flatstyle/CMakeLists.txt
@@ -28,6 +28,7 @@ target_link_libraries(flatstyle PUBLIC
Qt::Widgets
)
+
# Resources:
set(qmake_immediate_resource_files
"Flat/Button.qml"
@@ -47,7 +48,6 @@ qt6_add_resources(flatstyle "qmake_immediate"
${qmake_immediate_resource_files}
)
-
install(TARGETS flatstyle
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/gallery/CMakeLists.txt b/examples/quickcontrols2/gallery/CMakeLists.txt
index d259a88d..d62169e1 100644
--- a/examples/quickcontrols2/gallery/CMakeLists.txt
+++ b/examples/quickcontrols2/gallery/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(gallery PUBLIC
Qt::QuickControls2
)
+
# Resources:
set(qmake_immediate_resource_files
"gallery.qml"
@@ -91,7 +92,6 @@ qt6_add_resources(gallery "qmake_immediate"
${qmake_immediate_resource_files}
)
-
install(TARGETS gallery
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt b/examples/quickcontrols2/imagine/automotive/CMakeLists.txt
index 2c1662a7..22b0bd7b 100644
--- a/examples/quickcontrols2/imagine/automotive/CMakeLists.txt
+++ b/examples/quickcontrols2/imagine/automotive/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(automotive PUBLIC
Qt::QuickControls2
)
+
# Resources:
set(icons_resource_files
"automotive/44x44/air-con.png"
@@ -176,7 +177,6 @@ qt6_add_resources(automotive "qmake_immediate"
${qmake_immediate_resource_files}
)
-
install(TARGETS automotive
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt b/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt
index 4d36b744..28b17c95 100644
--- a/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt
+++ b/examples/quickcontrols2/imagine/musicplayer/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(musicplayer PUBLIC
Qt::QuickControls2
)
+
# Resources:
set(icons_resource_files
"musicplayer/32x32/bluetooth.png"
@@ -207,7 +208,6 @@ qt6_add_resources(musicplayer "qmake_immediate"
${qmake_immediate_resource_files}
)
-
install(TARGETS musicplayer
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/sidepanel/CMakeLists.txt b/examples/quickcontrols2/sidepanel/CMakeLists.txt
index 4be1c1a2..4946dc2d 100644
--- a/examples/quickcontrols2/sidepanel/CMakeLists.txt
+++ b/examples/quickcontrols2/sidepanel/CMakeLists.txt
@@ -24,6 +24,7 @@ target_link_libraries(sidepanel PUBLIC
Qt::Quick
)
+
# Resources:
set(qmake_immediate_resource_files
"doc/images/qtquickcontrols2-sidepanel-landscape.png"
@@ -42,7 +43,6 @@ qt6_add_resources(sidepanel "qmake_immediate"
${qmake_immediate_resource_files}
)
-
install(TARGETS sidepanel
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/swipetoremove/CMakeLists.txt b/examples/quickcontrols2/swipetoremove/CMakeLists.txt
index ea4fce5f..cf23122c 100644
--- a/examples/quickcontrols2/swipetoremove/CMakeLists.txt
+++ b/examples/quickcontrols2/swipetoremove/CMakeLists.txt
@@ -24,6 +24,7 @@ target_link_libraries(swipetoremove PUBLIC
Qt::Qml
)
+
# Resources:
set(qmake_immediate_resource_files
"fonts/fontello.ttf"
@@ -37,7 +38,6 @@ qt6_add_resources(swipetoremove "qmake_immediate"
${qmake_immediate_resource_files}
)
-
install(TARGETS swipetoremove
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quickcontrols2/texteditor/CMakeLists.txt b/examples/quickcontrols2/texteditor/CMakeLists.txt
index 99364bbe..9ae1a04d 100644
--- a/examples/quickcontrols2/texteditor/CMakeLists.txt
+++ b/examples/quickcontrols2/texteditor/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(texteditor PUBLIC
Qt::QuickControls2
)
+
# Resources:
set(texteditor_resource_files
"+touch/texteditor.html"
@@ -45,19 +46,16 @@ qt6_add_resources(texteditor "texteditor"
${texteditor_resource_files}
)
-
if(TARGET Qt::Widgets)
target_link_libraries(texteditor PUBLIC
Qt::Widgets
)
-
endif()
if(cross_compile)
target_compile_definitions(texteditor PUBLIC
QT_EXTRA_FILE_SELECTOR=\\\"touch\\\"
)
-
endif()
install(TARGETS texteditor
diff --git a/examples/quickcontrols2/wearable/CMakeLists.txt b/examples/quickcontrols2/wearable/CMakeLists.txt
index 67902d12..d0be1111 100644
--- a/examples/quickcontrols2/wearable/CMakeLists.txt
+++ b/examples/quickcontrols2/wearable/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(wearable PUBLIC
Qt::QuickControls2
)
+
# Resources:
set(wearable_resource_files
"icons/wearable/36x36/alarms.png"
@@ -188,7 +189,6 @@ qt6_add_resources(wearable "wearable"
${wearable_resource_files}
)
-
install(TARGETS wearable
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"