From b76c6ae9449959f8d994185deb8bfdf759bbc1a5 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 17 Aug 2021 07:44:55 +0200
Subject: CMake: Don't give plugins PUBLIC usage requirements part 2

Plugins shouldn't have public usage requirements.

Amends 4686bb97ee8a7159f889e8957537f59d255937c2

Pick-to: 6.2
Task-number: QTBUG-90819
Change-Id: I5adc59533573d7db4ab81873072288f52d3b2b8f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 src/plugins/sensors/android/CMakeLists.txt          | 2 +-
 src/plugins/sensors/dummy/CMakeLists.txt            | 2 +-
 src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt | 2 +-
 src/plugins/sensors/ios/CMakeLists.txt              | 8 ++++----
 src/plugins/sensors/linux/CMakeLists.txt            | 2 +-
 src/plugins/sensors/sensorfw/CMakeLists.txt         | 3 +--
 src/plugins/sensors/winrt/CMakeLists.txt            | 7 +++----
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/plugins/sensors/android/CMakeLists.txt b/src/plugins/sensors/android/CMakeLists.txt
index aa9d62d5..21cb06c5 100644
--- a/src/plugins/sensors/android/CMakeLists.txt
+++ b/src/plugins/sensors/android/CMakeLists.txt
@@ -22,7 +22,7 @@ qt_internal_add_plugin(AndroidSensorPlugin
         # STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in main.cpp
         # Yes, the plugin imports itself statically
         QT_STATICPLUGIN
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::Sensors
         android
diff --git a/src/plugins/sensors/dummy/CMakeLists.txt b/src/plugins/sensors/dummy/CMakeLists.txt
index 492e91ed..8d001edf 100644
--- a/src/plugins/sensors/dummy/CMakeLists.txt
+++ b/src/plugins/sensors/dummy/CMakeLists.txt
@@ -22,6 +22,6 @@ qt_internal_add_plugin(dummySensorPlugin
 #####################################################################
 
 qt_internal_extend_target(dummySensorPlugin CONDITION UNIX AND NOT ANDROID AND NOT APPLE AND NOT OPENBSD AND NOT QNX
-    PUBLIC_LIBRARIES
+    LIBRARIES
         rt
 )
diff --git a/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt b/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt
index ac6141f9..b13e9000 100644
--- a/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt
+++ b/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt
@@ -36,6 +36,6 @@ qt_internal_add_plugin(IIOSensorProxySensorPlugin
 #####################################################################
 
 qt_internal_extend_target(IIOSensorProxySensorPlugin CONDITION NOT ANDROID
-    PUBLIC_LIBRARIES
+    LIBRARIES
         rt
 )
diff --git a/src/plugins/sensors/ios/CMakeLists.txt b/src/plugins/sensors/ios/CMakeLists.txt
index a6236a6d..56a47f17 100644
--- a/src/plugins/sensors/ios/CMakeLists.txt
+++ b/src/plugins/sensors/ios/CMakeLists.txt
@@ -7,7 +7,7 @@ qt_internal_add_plugin(IOSSensorPlugin
     PLUGIN_TYPE sensors
     SOURCES
         main.mm
-    PUBLIC_LIBRARIES
+    LIBRARIES
         ${FWFoundation}
         Qt::Core
         Qt::Sensors
@@ -29,7 +29,7 @@ qt_internal_extend_target(IOSSensorPlugin CONDITION IOS AND UIKIT
         ioscompass.h ioscompass.mm
     DEFINES
         HAVE_COMPASS
-    PUBLIC_LIBRARIES
+    LIBRARIES
         ${FWCoreLocation}
 )
 
@@ -41,7 +41,7 @@ qt_internal_extend_target(IOSSensorPlugin CONDITION UIKIT AND NOT TVOS
         iosmotionmanager.h iosmotionmanager.mm
     DEFINES
         HAVE_COREMOTION
-    PUBLIC_LIBRARIES
+    LIBRARIES
         ${FWCoreMotion}
 )
 
@@ -50,6 +50,6 @@ qt_internal_extend_target(IOSSensorPlugin CONDITION UIKIT AND NOT WATCHOS
         iosproximitysensor.h iosproximitysensor.mm
     DEFINES
         HAVE_UIDEVICE
-    PUBLIC_LIBRARIES
+    LIBRARIES
         ${FWUIKit}
 )
diff --git a/src/plugins/sensors/linux/CMakeLists.txt b/src/plugins/sensors/linux/CMakeLists.txt
index 499f7dcc..5df7029d 100644
--- a/src/plugins/sensors/linux/CMakeLists.txt
+++ b/src/plugins/sensors/linux/CMakeLists.txt
@@ -20,6 +20,6 @@ qt_internal_add_plugin(LinuxSensorPlugin
 #####################################################################
 
 qt_internal_extend_target(LinuxSensorPlugin CONDITION NOT ANDROID
-    PUBLIC_LIBRARIES
+    LIBRARIES
         rt
 )
diff --git a/src/plugins/sensors/sensorfw/CMakeLists.txt b/src/plugins/sensors/sensorfw/CMakeLists.txt
index af21f92c..edf050ec 100644
--- a/src/plugins/sensors/sensorfw/CMakeLists.txt
+++ b/src/plugins/sensors/sensorfw/CMakeLists.txt
@@ -20,11 +20,10 @@ qt_internal_add_plugin(sensorfwSensorPlugin
         sensorfwrotationsensor.cpp sensorfwrotationsensor.h
         sensorfwsensorbase.cpp sensorfwsensorbase.h
         sensorfwtapsensor.cpp sensorfwtapsensor.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::DBus
         Qt::Network
-    LIBRARIES
         Qt::SensorsPrivate
         sensorfw
 )
diff --git a/src/plugins/sensors/winrt/CMakeLists.txt b/src/plugins/sensors/winrt/CMakeLists.txt
index aa82f472..455c1f01 100644
--- a/src/plugins/sensors/winrt/CMakeLists.txt
+++ b/src/plugins/sensors/winrt/CMakeLists.txt
@@ -14,15 +14,14 @@ qt_internal_add_plugin(WinRtSensorPlugin
         winrtgyroscope.cpp winrtgyroscope.h
         winrtorientationsensor.cpp winrtorientationsensor.h
         winrtrotationsensor.cpp winrtrotationsensor.h
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Sensors
     LIBRARIES
+        Qt::Core
         Qt::CorePrivate
+        Qt::Sensors
 )
 
 qt_internal_extend_target(WinRtSensorPlugin CONDITION MSVC
-    PUBLIC_LIBRARIES
+    LIBRARIES
         runtimeobject.lib
 )
 
-- 
cgit v1.2.3