summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-04-20 09:09:59 +0300
committerJuha Vuolle <juha.vuolle@insta.fi>2021-04-20 12:17:05 +0300
commit84cd882daf1afab59596f2f27db5aad5ce9b8f6b (patch)
treef3fbcbe393381bd89237987c32d1f21cf8969296 /src/plugins
parent45c8ae3232df8955644697ee88c4321f26bb5cf2 (diff)
Compile-config test for winrt
While winrt as a "windows phone" is not supported anymore, the APIs are available on windows and can be supported where applicable (bluetooth, positioning, sensors, ...). This commit adds a configuration tests for the presence of these headers and libraries. Task-number: QTBUG-92502 Change-Id: Ia6dcb0a6b8ecdbcf1d1bcf79e42f95ace75f6657 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sensors/CMakeLists.txt2
-rw-r--r--src/plugins/sensors/winrt/CMakeLists.txt6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/sensors/CMakeLists.txt b/src/plugins/sensors/CMakeLists.txt
index 08bfa26a..7b0644c4 100644
--- a/src/plugins/sensors/CMakeLists.txt
+++ b/src/plugins/sensors/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
# add_subdirectory(sensorfw)
#endif()
-if (WIN32 AND NOT SENSORS_PLUGINS OR "winrt" IN_LIST SENSORS_PLUGINS)
+if (QT_FEATURE_winrt_sensors AND NOT SENSORS_PLUGINS OR "winrt" IN_LIST SENSORS_PLUGINS)
add_subdirectory(winrt)
endif()
diff --git a/src/plugins/sensors/winrt/CMakeLists.txt b/src/plugins/sensors/winrt/CMakeLists.txt
index 2099547e..cd8191e8 100644
--- a/src/plugins/sensors/winrt/CMakeLists.txt
+++ b/src/plugins/sensors/winrt/CMakeLists.txt
@@ -19,7 +19,11 @@ qt_internal_add_plugin(WinRtSensorPlugin
Qt::Sensors
LIBRARIES
Qt::CorePrivate
- runtimeobject
+)
+
+qt_internal_extend_target(WinRtSensorPlugin CONDITION MSVC
+ PUBLIC_LIBRARIES
+ runtimeobject.lib
)
#### Keys ignored in scope 1:.:.:winrt.pro:<TRUE>: