From 27997c678f1bfeccd52e77ee11fc5fbcd2d6ae56 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 29 Jun 2022 16:07:58 +0200 Subject: 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 (cherry picked from commit 7c66391a96dc3d42c654c0de055a09327e7674e5) Reviewed-by: Qt Cherry-pick Bot --- src/imports/compositor-extensions/qtshell/CMakeLists.txt | 2 +- src/plugins/shellintegration/qt-shell/CMakeLists.txt | 2 +- 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 ccad8ae5..d9b3d5ef 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 bf466d32..75432054 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 -- cgit v1.2.1