From b4ff1333677dc1c037b5ff5e5101016bd6a53469 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Wed, 26 May 2021 17:07:52 +0200 Subject: Use fixed qt_add_resource BASE argument Task-number: QTBUG-86726 Change-Id: I33ec2a73254d9b44de83f4f5491f372b4bb9959b Reviewed-by: Joerg Bornemann --- CMakeLists.txt | 3 ++ examples/CMakeLists.txt | 3 ++ examples/webengine/recipebrowser/CMakeLists.txt | 40 +++++++++---------- .../webenginewidgets/cookiebrowser/CMakeLists.txt | 5 +-- .../webenginewidgets/markdowneditor/CMakeLists.txt | 8 ++-- .../webenginewidgets/notifications/CMakeLists.txt | 4 +- examples/webenginewidgets/printme/CMakeLists.txt | 6 +-- .../webenginewidgets/simplebrowser/CMakeLists.txt | 46 ++++++---------------- .../webenginewidgets/spellchecker/CMakeLists.txt | 6 +-- .../stylesheetbrowser/CMakeLists.txt | 5 +-- .../webenginewidgets/videoplayer/CMakeLists.txt | 2 +- src/CMakeLists.txt | 3 ++ tests/CMakeLists.txt | 3 ++ 13 files changed, 60 insertions(+), 74 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 203cd1c6c..1281ef59b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,9 @@ project(QtWebEngineRepoSuperBuild LANGUAGES CXX C ) +# Make sure we use the fixed BASE argument of qt_add_resource. +set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) + option(FORCE_TEST_RUN "Forces test run after compilation" FALSE) find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b24fbb85d..0e1ba1226 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -9,6 +9,9 @@ project(QtWebEngineExamples LANGUAGES CXX C ) +# Make sure we use the fixed BASE argument of qt_add_resource. +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) qt_build_repo_begin() diff --git a/examples/webengine/recipebrowser/CMakeLists.txt b/examples/webengine/recipebrowser/CMakeLists.txt index c39f65a65..2464a1e63 100644 --- a/examples/webengine/recipebrowser/CMakeLists.txt +++ b/examples/webengine/recipebrowser/CMakeLists.txt @@ -99,26 +99,26 @@ set_source_files_properties("resources/qml/main.qml" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) set(resources_resource_files - "pages/assets/3rdparty/markdown.css" - "pages/assets/3rdparty/marked.js" - "pages/assets/custom.css" - "pages/assets/custom.js" - "pages/burger.html" - "pages/cupcakes.html" - "pages/images/burger.jpg" - "pages/images/cupcakes.jpg" - "pages/images/pasta.jpg" - "pages/images/pizza.jpg" - "pages/images/skewers.jpg" - "pages/images/soup.jpg" - "pages/images/steak.jpg" - "pages/pasta.html" - "pages/pizza.html" - "pages/skewers.html" - "pages/soup.html" - "pages/steak.html" - "qml/RecipeList.qml" - "qml/main.qml" + "resources/pages/assets/3rdparty/markdown.css" + "resources/pages/assets/3rdparty/marked.js" + "resources/pages/assets/custom.css" + "resources/pages/assets/custom.js" + "resources/pages/burger.html" + "resources/pages/cupcakes.html" + "resources/pages/images/burger.jpg" + "resources/pages/images/cupcakes.jpg" + "resources/pages/images/pasta.jpg" + "resources/pages/images/pizza.jpg" + "resources/pages/images/skewers.jpg" + "resources/pages/images/soup.jpg" + "resources/pages/images/steak.jpg" + "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" ) qt6_add_resources(recipebrowser "resources" diff --git a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt index 9837ae62d..16d2bfab6 100644 --- a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt +++ b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt @@ -35,9 +35,6 @@ target_link_libraries(cookiebrowser PUBLIC # Resources: -set_source_files_properties("3rdparty/view-refresh.png" - PROPERTIES QT_RESOURCE_ALIAS "view-refresh.png" -) set(cookiebrowser_resource_files "3rdparty/view-refresh.png" ) @@ -45,6 +42,8 @@ set(cookiebrowser_resource_files qt6_add_resources(cookiebrowser "cookiebrowser" PREFIX "/" + BASE + "3rdparty" FILES ${cookiebrowser_resource_files} ) diff --git a/examples/webenginewidgets/markdowneditor/CMakeLists.txt b/examples/webenginewidgets/markdowneditor/CMakeLists.txt index e6367c3cb..29bcc2d70 100644 --- a/examples/webenginewidgets/markdowneditor/CMakeLists.txt +++ b/examples/webenginewidgets/markdowneditor/CMakeLists.txt @@ -38,10 +38,10 @@ target_link_libraries(markdowneditor PUBLIC # Resources: set(markdowneditor_resource_files - "3rdparty/markdown.css" - "3rdparty/marked.js" - "default.md" - "index.html" + "resources/3rdparty/markdown.css" + "resources/3rdparty/marked.js" + "resources/default.md" + "resources/index.html" ) qt6_add_resources(markdowneditor "markdowneditor" diff --git a/examples/webenginewidgets/notifications/CMakeLists.txt b/examples/webenginewidgets/notifications/CMakeLists.txt index 722d1c61e..0f6e504d9 100644 --- a/examples/webenginewidgets/notifications/CMakeLists.txt +++ b/examples/webenginewidgets/notifications/CMakeLists.txt @@ -34,8 +34,8 @@ target_link_libraries(notifications PUBLIC # Resources: set(data_resource_files - "icon.png" - "index.html" + "data/icon.png" + "data/index.html" ) qt6_add_resources(notifications "data" diff --git a/examples/webenginewidgets/printme/CMakeLists.txt b/examples/webenginewidgets/printme/CMakeLists.txt index 705214fc3..6b21de270 100644 --- a/examples/webenginewidgets/printme/CMakeLists.txt +++ b/examples/webenginewidgets/printme/CMakeLists.txt @@ -36,9 +36,9 @@ target_link_libraries(printme PUBLIC # Resources: set(data_resource_files - "icon.svg" - "index.html" - "style.css" + "data/icon.svg" + "data/index.html" + "data/style.css" ) qt6_add_resources(printme "data" diff --git a/examples/webenginewidgets/simplebrowser/CMakeLists.txt b/examples/webenginewidgets/simplebrowser/CMakeLists.txt index 4b8bb732e..21ae993e5 100644 --- a/examples/webenginewidgets/simplebrowser/CMakeLists.txt +++ b/examples/webenginewidgets/simplebrowser/CMakeLists.txt @@ -43,8 +43,8 @@ target_link_libraries(simplebrowser PUBLIC # Resources: set(simplebrowser_resource_files - "AppLogoColor.png" - "ninja.png" + "data/AppLogoColor.png" + "data/ninja.png" ) qt6_add_resources(simplebrowser "simplebrowser" @@ -55,46 +55,22 @@ qt6_add_resources(simplebrowser "simplebrowser" FILES ${simplebrowser_resource_files} ) -set_source_files_properties("data/3rdparty/dialog-error.png" - PROPERTIES QT_RESOURCE_ALIAS "dialog-error.png" -) -set_source_files_properties("data/3rdparty/edit-clear.png" - PROPERTIES QT_RESOURCE_ALIAS "edit-clear.png" -) -set_source_files_properties("data/3rdparty/go-bottom.png" - PROPERTIES QT_RESOURCE_ALIAS "go-bottom.png" -) -set_source_files_properties("data/3rdparty/go-next.png" - PROPERTIES QT_RESOURCE_ALIAS "go-next.png" -) -set_source_files_properties("data/3rdparty/go-previous.png" - PROPERTIES QT_RESOURCE_ALIAS "go-previous.png" -) -set_source_files_properties("data/3rdparty/process-stop.png" - PROPERTIES QT_RESOURCE_ALIAS "process-stop.png" -) -set_source_files_properties("data/3rdparty/text-html.png" - PROPERTIES QT_RESOURCE_ALIAS "text-html.png" -) -set_source_files_properties("data/3rdparty/view-refresh.png" - PROPERTIES QT_RESOURCE_ALIAS "view-refresh.png" -) set(simplebrowser1_resource_files - "3rdparty/dialog-error.png" - "3rdparty/edit-clear.png" - "3rdparty/go-bottom.png" - "3rdparty/go-next.png" - "3rdparty/go-previous.png" - "3rdparty/process-stop.png" - "3rdparty/text-html.png" - "3rdparty/view-refresh.png" + "data/3rdparty/dialog-error.png" + "data/3rdparty/edit-clear.png" + "data/3rdparty/go-bottom.png" + "data/3rdparty/go-next.png" + "data/3rdparty/go-previous.png" + "data/3rdparty/process-stop.png" + "data/3rdparty/text-html.png" + "data/3rdparty/view-refresh.png" ) qt6_add_resources(simplebrowser "simplebrowser1" PREFIX "/" BASE - "data" + "data/3rdparty" FILES ${simplebrowser1_resource_files} ) diff --git a/examples/webenginewidgets/spellchecker/CMakeLists.txt b/examples/webenginewidgets/spellchecker/CMakeLists.txt index d8b181841..b8e17b1ac 100644 --- a/examples/webenginewidgets/spellchecker/CMakeLists.txt +++ b/examples/webenginewidgets/spellchecker/CMakeLists.txt @@ -34,9 +34,9 @@ target_link_libraries(spellchecker PUBLIC # Resources: set(spellchecker_resource_files - "icon.svg" - "index.html" - "style.css" + "data/icon.svg" + "data/index.html" + "data/style.css" ) qt6_add_resources(spellchecker "spellchecker" diff --git a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt index 91d5200e1..596da7964 100644 --- a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt +++ b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt @@ -34,9 +34,6 @@ target_link_libraries(stylesheetbrowser PUBLIC # Resources: -set_source_files_properties("3rdparty/view-refresh.png" - PROPERTIES QT_RESOURCE_ALIAS "view-refresh.png" -) set(stylesheetbrowser_resource_files "3rdparty/view-refresh.png" ) @@ -44,6 +41,8 @@ set(stylesheetbrowser_resource_files qt6_add_resources(stylesheetbrowser "stylesheetbrowser" PREFIX "/" + BASE + "3rdparty" FILES ${stylesheetbrowser_resource_files} ) diff --git a/examples/webenginewidgets/videoplayer/CMakeLists.txt b/examples/webenginewidgets/videoplayer/CMakeLists.txt index 3d064f862..f6db97149 100644 --- a/examples/webenginewidgets/videoplayer/CMakeLists.txt +++ b/examples/webenginewidgets/videoplayer/CMakeLists.txt @@ -36,7 +36,7 @@ target_link_libraries(videoplayer PUBLIC # Resources: set(videoplayer_resource_files - "index.html" + "data/index.html" ) qt6_add_resources(videoplayer "videoplayer" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 500f6ed89..f46b55f82 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,6 +17,9 @@ project(QtWebEngineRepo HOMEPAGE_URL "https://qt.io" LANGUAGES CXX C) +# Make sure we use the fixed BASE argument of qt_add_resource. +set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) qt_build_repo_begin() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d334d49f1..e7b2008d1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,6 +9,9 @@ if(NOT QT_BUILD_STANDALONE_TESTS) HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) + + # Make sure we use the fixed BASE argument of qt_add_resource. + set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) endif() find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) -- cgit v1.2.3