summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBalazs Egedi <egedib@inf.u-szeged.hu>2021-07-01 16:19:28 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-09 02:33:22 +0000
commit16dabbcd43ccdb73f8f0e49d6ffa97e8dc534f51 (patch)
treefb3f86452ea22867870e41501ab95755fecfcd65
parentc9e296f776cc48741d9ea752294193b5f8384411 (diff)
Fix project files in Quick examples
- Fix typos - Fix Quick Controls 2 dependencies Change-Id: I3f8d2314a78f9193ce20b69cf2b1ed87311d4870 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3668c27dee6afe1ef0e05df4fc6c5a3450e84901) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/CMakeLists.txt2
-rw-r--r--examples/webengine/CMakeLists.txt2
-rw-r--r--examples/webengine/recipebrowser/CMakeLists.txt10
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 0e1ba1226..5c6e1592d 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -13,7 +13,7 @@ project(QtWebEngineExamples
set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
-find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS WebEngineCore WebEngineWidgets WebEngineQuick)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS WebEngineCore WebEngineWidgets WebEngineQuick QuickControls2)
qt_build_repo_begin()
qt_examples_build_begin()
diff --git a/examples/webengine/CMakeLists.txt b/examples/webengine/CMakeLists.txt
index 6e306111e..b08d03980 100644
--- a/examples/webengine/CMakeLists.txt
+++ b/examples/webengine/CMakeLists.txt
@@ -1,8 +1,8 @@
add_subdirectory(customdialogs)
+add_subdirectory(lifecycle)
add_subdirectory(minimal)
add_subdirectory(quicknanobrowser)
add_subdirectory(webengineaction)
if(TARGET Qt::QuickControls2)
- add_subdirectory(lifecycle)
add_subdirectory(recipebrowser)
endif()
diff --git a/examples/webengine/recipebrowser/CMakeLists.txt b/examples/webengine/recipebrowser/CMakeLists.txt
index 2464a1e63..8af1aa340 100644
--- a/examples/webengine/recipebrowser/CMakeLists.txt
+++ b/examples/webengine/recipebrowser/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(recipebrowser PUBLIC
Qt::Qml
Qt::Quick
Qt::QuickControls2
- Qt::WebEngineQucik
+ Qt::WebEngineQuick
)
@@ -115,10 +115,10 @@ set(resources_resource_files
"resources/pages/pasta.html"
"resources/pages/pizza.html"
"resources/pages/skewers.html"
- "reosurces/pages/soup.html"
- "reosurces/pages/steak.html"
- "reosurces/qml/RecipeList.qml"
- "reosurces/qml/main.qml"
+ "resources/pages/soup.html"
+ "resources/pages/steak.html"
+ "resources/qml/main.qml"
+ "resources/qml/RecipeList.qml"
)
qt6_add_resources(recipebrowser "resources"