summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-10-27 11:17:14 +0200
committerMichal Klocek <michal.klocek@qt.io>2021-10-28 09:42:43 +0000
commit32924ec6b27d3da0ffbeec93e1b8c19ff9c49387 (patch)
tree270333465c40c851c335ff5531288cf85a79796d
parentf2dc94aca3ca8417e73bf914fe3fd3b59eefc19f (diff)
Minor. Cleanup qt6_add_resources usage
We should not use qt6 prefixed functions in examples. Pick-to: 6.2 Change-Id: Ibf2618ef4f64b560decb219527d619aad680f216 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--examples/pdf/multipage/CMakeLists.txt2
-rw-r--r--examples/pdf/pdfviewer/CMakeLists.txt2
-rw-r--r--examples/pdfwidgets/pdfviewer/CMakeLists.txt2
-rw-r--r--examples/webenginequick/customdialogs/CMakeLists.txt2
-rw-r--r--examples/webenginequick/lifecycle/CMakeLists.txt2
-rw-r--r--examples/webenginequick/minimal/CMakeLists.txt2
-rw-r--r--examples/webenginequick/quicknanobrowser/CMakeLists.txt4
-rw-r--r--examples/webenginequick/recipebrowser/CMakeLists.txt2
-rw-r--r--examples/webenginequick/webengineaction/CMakeLists.txt2
-rw-r--r--examples/webenginewidgets/contentmanipulation/CMakeLists.txt2
-rw-r--r--examples/webenginewidgets/cookiebrowser/CMakeLists.txt2
-rw-r--r--examples/webenginewidgets/markdowneditor/CMakeLists.txt2
-rw-r--r--examples/webenginewidgets/notifications/CMakeLists.txt2
-rw-r--r--examples/webenginewidgets/printme/CMakeLists.txt2
-rw-r--r--examples/webenginewidgets/simplebrowser/CMakeLists.txt4
-rw-r--r--examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt2
-rw-r--r--examples/webenginewidgets/videoplayer/CMakeLists.txt2
-rw-r--r--examples/webenginewidgets/webui/CMakeLists.txt2
18 files changed, 20 insertions, 20 deletions
diff --git a/examples/pdf/multipage/CMakeLists.txt b/examples/pdf/multipage/CMakeLists.txt
index 141da88b6..e89c8d238 100644
--- a/examples/pdf/multipage/CMakeLists.txt
+++ b/examples/pdf/multipage/CMakeLists.txt
@@ -48,7 +48,7 @@ set(viewer_resource_files
"viewer.qml"
)
-qt6_add_resources(multipage "viewer"
+qt_add_resources(multipage "viewer"
PREFIX
"/pdfviewer"
FILES
diff --git a/examples/pdf/pdfviewer/CMakeLists.txt b/examples/pdf/pdfviewer/CMakeLists.txt
index 8265861d0..5a3821399 100644
--- a/examples/pdf/pdfviewer/CMakeLists.txt
+++ b/examples/pdf/pdfviewer/CMakeLists.txt
@@ -48,7 +48,7 @@ set(viewer_resource_files
"viewer.qml"
)
-qt6_add_resources(pdfviewerquick "viewer"
+qt_add_resources(pdfviewerquick "viewer"
PREFIX
"/pdfviewer"
FILES
diff --git a/examples/pdfwidgets/pdfviewer/CMakeLists.txt b/examples/pdfwidgets/pdfviewer/CMakeLists.txt
index a530b3212..692c33371 100644
--- a/examples/pdfwidgets/pdfviewer/CMakeLists.txt
+++ b/examples/pdfwidgets/pdfviewer/CMakeLists.txt
@@ -49,7 +49,7 @@ set(resources_resource_files
"images/zoom-out-32.png"
)
-qt6_add_resources(pdfviewerwidgets "resources"
+qt_add_resources(pdfviewerwidgets "resources"
PREFIX
"/icons"
FILES
diff --git a/examples/webenginequick/customdialogs/CMakeLists.txt b/examples/webenginequick/customdialogs/CMakeLists.txt
index 3e4e457fa..47d773c48 100644
--- a/examples/webenginequick/customdialogs/CMakeLists.txt
+++ b/examples/webenginequick/customdialogs/CMakeLists.txt
@@ -56,7 +56,7 @@ set(customdialogs_resource_files
"style.css"
)
-qt6_add_resources(customdialogs "customdialogs"
+qt_add_resources(customdialogs "customdialogs"
PREFIX
"/"
FILES
diff --git a/examples/webenginequick/lifecycle/CMakeLists.txt b/examples/webenginequick/lifecycle/CMakeLists.txt
index 2d7b3e26b..8f90cbf48 100644
--- a/examples/webenginequick/lifecycle/CMakeLists.txt
+++ b/examples/webenginequick/lifecycle/CMakeLists.txt
@@ -43,7 +43,7 @@ set(resources_resource_files
"qtquickcontrols2.conf"
)
-qt6_add_resources(lifecycle "resources"
+qt_add_resources(lifecycle "resources"
PREFIX
"/"
FILES
diff --git a/examples/webenginequick/minimal/CMakeLists.txt b/examples/webenginequick/minimal/CMakeLists.txt
index 34276e8b3..9155ce040 100644
--- a/examples/webenginequick/minimal/CMakeLists.txt
+++ b/examples/webenginequick/minimal/CMakeLists.txt
@@ -36,7 +36,7 @@ set(qml_resource_files
"main.qml"
)
-qt6_add_resources(webengine-minimal-qml "qml"
+qt_add_resources(webengine-minimal-qml "qml"
PREFIX
"/"
FILES
diff --git a/examples/webenginequick/quicknanobrowser/CMakeLists.txt b/examples/webenginequick/quicknanobrowser/CMakeLists.txt
index a9e8bb4ae..9a70a2c22 100644
--- a/examples/webenginequick/quicknanobrowser/CMakeLists.txt
+++ b/examples/webenginequick/quicknanobrowser/CMakeLists.txt
@@ -46,7 +46,7 @@ set(resources_resource_files
"FullScreenNotification.qml"
)
-qt6_add_resources(quicknanobrowser "resources"
+qt_add_resources(quicknanobrowser "resources"
PREFIX
"/"
FILES
@@ -59,7 +59,7 @@ set(resources1_resource_files
"icons/3rdparty/view-refresh.png"
)
-qt6_add_resources(quicknanobrowser "resources1"
+qt_add_resources(quicknanobrowser "resources1"
PREFIX
"/icons"
BASE
diff --git a/examples/webenginequick/recipebrowser/CMakeLists.txt b/examples/webenginequick/recipebrowser/CMakeLists.txt
index bb768a476..9643234e7 100644
--- a/examples/webenginequick/recipebrowser/CMakeLists.txt
+++ b/examples/webenginequick/recipebrowser/CMakeLists.txt
@@ -121,7 +121,7 @@ set(resources_resource_files
"resources/qml/RecipeList.qml"
)
-qt6_add_resources(recipebrowser "resources"
+qt_add_resources(recipebrowser "resources"
PREFIX
"/"
BASE
diff --git a/examples/webenginequick/webengineaction/CMakeLists.txt b/examples/webenginequick/webengineaction/CMakeLists.txt
index a7bbf1ed5..926825d21 100644
--- a/examples/webenginequick/webengineaction/CMakeLists.txt
+++ b/examples/webenginequick/webengineaction/CMakeLists.txt
@@ -36,7 +36,7 @@ set(qml_resource_files
"main.qml"
)
-qt6_add_resources(webengineaction "qml"
+qt_add_resources(webengineaction "qml"
PREFIX
"/"
FILES
diff --git a/examples/webenginewidgets/contentmanipulation/CMakeLists.txt b/examples/webenginewidgets/contentmanipulation/CMakeLists.txt
index 9ff58587d..ae93a7a7e 100644
--- a/examples/webenginewidgets/contentmanipulation/CMakeLists.txt
+++ b/examples/webenginewidgets/contentmanipulation/CMakeLists.txt
@@ -37,7 +37,7 @@ set(jquery_resource_files
"jquery.min.js"
)
-qt6_add_resources(contentmanipulation "jquery"
+qt_add_resources(contentmanipulation "jquery"
PREFIX
"/"
FILES
diff --git a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt
index 16d2bfab6..e94ecae7a 100644
--- a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt
+++ b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt
@@ -39,7 +39,7 @@ set(cookiebrowser_resource_files
"3rdparty/view-refresh.png"
)
-qt6_add_resources(cookiebrowser "cookiebrowser"
+qt_add_resources(cookiebrowser "cookiebrowser"
PREFIX
"/"
BASE
diff --git a/examples/webenginewidgets/markdowneditor/CMakeLists.txt b/examples/webenginewidgets/markdowneditor/CMakeLists.txt
index 29bcc2d70..3852b93d4 100644
--- a/examples/webenginewidgets/markdowneditor/CMakeLists.txt
+++ b/examples/webenginewidgets/markdowneditor/CMakeLists.txt
@@ -44,7 +44,7 @@ set(markdowneditor_resource_files
"resources/index.html"
)
-qt6_add_resources(markdowneditor "markdowneditor"
+qt_add_resources(markdowneditor "markdowneditor"
PREFIX
"/"
BASE
diff --git a/examples/webenginewidgets/notifications/CMakeLists.txt b/examples/webenginewidgets/notifications/CMakeLists.txt
index 0f6e504d9..6e152cf6c 100644
--- a/examples/webenginewidgets/notifications/CMakeLists.txt
+++ b/examples/webenginewidgets/notifications/CMakeLists.txt
@@ -38,7 +38,7 @@ set(data_resource_files
"data/index.html"
)
-qt6_add_resources(notifications "data"
+qt_add_resources(notifications "data"
PREFIX
"/"
BASE
diff --git a/examples/webenginewidgets/printme/CMakeLists.txt b/examples/webenginewidgets/printme/CMakeLists.txt
index 6b21de270..ada0bf250 100644
--- a/examples/webenginewidgets/printme/CMakeLists.txt
+++ b/examples/webenginewidgets/printme/CMakeLists.txt
@@ -41,7 +41,7 @@ set(data_resource_files
"data/style.css"
)
-qt6_add_resources(printme "data"
+qt_add_resources(printme "data"
PREFIX
"/"
BASE
diff --git a/examples/webenginewidgets/simplebrowser/CMakeLists.txt b/examples/webenginewidgets/simplebrowser/CMakeLists.txt
index 21ae993e5..ee11c02d1 100644
--- a/examples/webenginewidgets/simplebrowser/CMakeLists.txt
+++ b/examples/webenginewidgets/simplebrowser/CMakeLists.txt
@@ -47,7 +47,7 @@ set(simplebrowser_resource_files
"data/ninja.png"
)
-qt6_add_resources(simplebrowser "simplebrowser"
+qt_add_resources(simplebrowser "simplebrowser"
PREFIX
"/"
BASE
@@ -66,7 +66,7 @@ set(simplebrowser1_resource_files
"data/3rdparty/view-refresh.png"
)
-qt6_add_resources(simplebrowser "simplebrowser1"
+qt_add_resources(simplebrowser "simplebrowser1"
PREFIX
"/"
BASE
diff --git a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt
index 596da7964..e0a1723f1 100644
--- a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt
+++ b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt
@@ -38,7 +38,7 @@ set(stylesheetbrowser_resource_files
"3rdparty/view-refresh.png"
)
-qt6_add_resources(stylesheetbrowser "stylesheetbrowser"
+qt_add_resources(stylesheetbrowser "stylesheetbrowser"
PREFIX
"/"
BASE
diff --git a/examples/webenginewidgets/videoplayer/CMakeLists.txt b/examples/webenginewidgets/videoplayer/CMakeLists.txt
index f6db97149..61f4e40c6 100644
--- a/examples/webenginewidgets/videoplayer/CMakeLists.txt
+++ b/examples/webenginewidgets/videoplayer/CMakeLists.txt
@@ -39,7 +39,7 @@ set(videoplayer_resource_files
"data/index.html"
)
-qt6_add_resources(videoplayer "videoplayer"
+qt_add_resources(videoplayer "videoplayer"
PREFIX
"/"
BASE
diff --git a/examples/webenginewidgets/webui/CMakeLists.txt b/examples/webenginewidgets/webui/CMakeLists.txt
index b4a6683c8..4d8123e1f 100644
--- a/examples/webenginewidgets/webui/CMakeLists.txt
+++ b/examples/webenginewidgets/webui/CMakeLists.txt
@@ -37,7 +37,7 @@ set(webui_resource_files
"about.html"
)
-qt6_add_resources(webui "webui"
+qt_add_resources(webui "webui"
PREFIX
"/"
FILES