summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-06-29 16:07:58 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-29 14:29:17 +0000
commit27997c678f1bfeccd52e77ee11fc5fbcd2d6ae56 (patch)
tree15ecc20ab3352898c2992a89171e5db3b3e3f641
parent0a5c3282fbc930ea4db83a5ea1c64bd3df2cfff2 (diff)
CMake: Get rid of a few warnings
Plugins should not link publicly to libraries. Don't use deprecated TYPE option of qt_add_plugin. Amends d89c8920f3b82dd2098971b5a66c4b9c75da5af0 Change-Id: I0b5ad54e802147778b1a979b16ff1c2c47eb8c5b Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 7c66391a96dc3d42c654c0de055a09327e7674e5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/imports/compositor-extensions/qtshell/CMakeLists.txt2
-rw-r--r--src/plugins/shellintegration/qt-shell/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/compositor-extensions/qtshell/CMakeLists.txt b/src/imports/compositor-extensions/qtshell/CMakeLists.txt
index ccad8ae59..d9b3d5ef8 100644
--- a/src/imports/compositor-extensions/qtshell/CMakeLists.txt
+++ b/src/imports/compositor-extensions/qtshell/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_qml_module(WaylandCompositorQtShell
qwaylandqtshell.cpp qwaylandqtshell.h qwaylandqtshell_p.h
qwaylandqtshellintegration.cpp qwaylandqtshellintegration_p.h
qwaylandqtshellchrome.cpp qwaylandqtshellchrome.h qwaylandqtshellchrome_p.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Core
Qt::Gui
Qt::Quick
diff --git a/src/plugins/shellintegration/qt-shell/CMakeLists.txt b/src/plugins/shellintegration/qt-shell/CMakeLists.txt
index bf466d322..754320541 100644
--- a/src/plugins/shellintegration/qt-shell/CMakeLists.txt
+++ b/src/plugins/shellintegration/qt-shell/CMakeLists.txt
@@ -4,7 +4,7 @@
qt_internal_add_plugin(QWaylandQtShellIntegrationPlugin
OUTPUT_NAME qt-shell
- TYPE wayland-shell-integration
+ PLUGIN_TYPE wayland-shell-integration
SOURCES
main.cpp
qwaylandqtshellintegration.cpp qwaylandqtshellintegration.h