summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-08-05 12:56:20 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-10 10:35:54 +0000
commitacf09bfcb9fbeb57506583203a81b64616186ba4 (patch)
treeaed8655445f4e926c8f7f014c638e7cc42b0d926
parent84509175243a5e262f88869db61e8f19d7b6adb1 (diff)
downloadqtlocation-acf09bfcb9fbeb57506583203a81b64616186ba4.tar.gz
CMake: Use renamed qt6_add_plugin PLUGIN_TYPE option
Task-number: QTBUG-95170 Change-Id: I041d949a1b5d3097f756befb1d03ed3734665f82 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 3dd6e04c7f4d9304aa22737d5610293adbd5995f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/position/android/src/CMakeLists.txt2
-rw-r--r--src/plugins/position/corelocation/CMakeLists.txt2
-rw-r--r--src/plugins/position/geoclue2/CMakeLists.txt2
-rw-r--r--src/plugins/position/gypsy/CMakeLists.txt2
-rw-r--r--src/plugins/position/nmea/CMakeLists.txt2
-rw-r--r--src/plugins/position/positionpoll/CMakeLists.txt2
-rw-r--r--src/plugins/position/winrt/CMakeLists.txt2
-rw-r--r--tests/auto/dummypositionplugin/CMakeLists.txt2
-rw-r--r--tests/auto/positionplugin/CMakeLists.txt2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/position/android/src/CMakeLists.txt b/src/plugins/position/android/src/CMakeLists.txt
index af60c825..91d437ed 100644
--- a/src/plugins/position/android/src/CMakeLists.txt
+++ b/src/plugins/position/android/src/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(QGeoPositionInfoSourceFactoryAndroid
OUTPUT_NAME qtposition_android
- TYPE position
+ PLUGIN_TYPE position
SOURCES
jnipositioning.cpp jnipositioning.h
positionfactory_android.cpp positionfactory_android.h
diff --git a/src/plugins/position/corelocation/CMakeLists.txt b/src/plugins/position/corelocation/CMakeLists.txt
index 8a0df3f0..a3278358 100644
--- a/src/plugins/position/corelocation/CMakeLists.txt
+++ b/src/plugins/position/corelocation/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(QGeoPositionInfoSourceFactoryCL
OUTPUT_NAME qtposition_cl
- TYPE position
+ PLUGIN_TYPE position
SOURCES
qgeopositioninfosource_cl.mm qgeopositioninfosource_cl_p.h
qgeopositioninfosourcefactory_cl.h qgeopositioninfosourcefactory_cl.mm
diff --git a/src/plugins/position/geoclue2/CMakeLists.txt b/src/plugins/position/geoclue2/CMakeLists.txt
index 279672d4..0ba49a63 100644
--- a/src/plugins/position/geoclue2/CMakeLists.txt
+++ b/src/plugins/position/geoclue2/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(QGeoPositionInfoSourceFactoryGeoclue2
OUTPUT_NAME qtposition_geoclue2
- TYPE position
+ PLUGIN_TYPE position
SOURCES
geocluetypes.cpp geocluetypes.h
qgeopositioninfosource_geoclue2.cpp qgeopositioninfosource_geoclue2_p.h
diff --git a/src/plugins/position/gypsy/CMakeLists.txt b/src/plugins/position/gypsy/CMakeLists.txt
index c4aa7aea..451c453e 100644
--- a/src/plugins/position/gypsy/CMakeLists.txt
+++ b/src/plugins/position/gypsy/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(QGeoPositionInfoSourceFactoryGypsy
OUTPUT_NAME qtposition_gypsy
- TYPE position
+ PLUGIN_TYPE position
SOURCES
qgeopositioninfosourcefactory_gypsy.cpp qgeopositioninfosourcefactory_gypsy.h
qgeosatelliteinfosource_gypsy.cpp qgeosatelliteinfosource_gypsy_p.h
diff --git a/src/plugins/position/nmea/CMakeLists.txt b/src/plugins/position/nmea/CMakeLists.txt
index 2f0d7d4d..f348d0a2 100644
--- a/src/plugins/position/nmea/CMakeLists.txt
+++ b/src/plugins/position/nmea/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(QGeoPositionInfoSourceFactoryNmea
OUTPUT_NAME qtposition_nmea
- TYPE position
+ PLUGIN_TYPE position
SOURCES
qgeopositioninfosourcefactory_nmea.cpp qgeopositioninfosourcefactory_nmea.h
qiopipe.cpp qiopipe_p.h
diff --git a/src/plugins/position/positionpoll/CMakeLists.txt b/src/plugins/position/positionpoll/CMakeLists.txt
index 8051b4a4..35f76e01 100644
--- a/src/plugins/position/positionpoll/CMakeLists.txt
+++ b/src/plugins/position/positionpoll/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(QGeoPositionInfoSourceFactoryPoll
OUTPUT_NAME qtposition_positionpoll
- TYPE position
+ PLUGIN_TYPE position
SOURCES
positionpollfactory.cpp positionpollfactory.h
qgeoareamonitor_polling.cpp qgeoareamonitor_polling.h
diff --git a/src/plugins/position/winrt/CMakeLists.txt b/src/plugins/position/winrt/CMakeLists.txt
index f3f0675f..211b44c8 100644
--- a/src/plugins/position/winrt/CMakeLists.txt
+++ b/src/plugins/position/winrt/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(QGeoPositionInfoSourceFactoryWinRT
OUTPUT_NAME qtposition_winrt
- TYPE position
+ PLUGIN_TYPE position
SOURCES
qgeopositioninfosource_winrt.cpp qgeopositioninfosource_winrt_p.h
qgeopositioninfosourcefactory_winrt.cpp qgeopositioninfosourcefactory_winrt.h
diff --git a/tests/auto/dummypositionplugin/CMakeLists.txt b/tests/auto/dummypositionplugin/CMakeLists.txt
index 377f61f9..c5806df4 100644
--- a/tests/auto/dummypositionplugin/CMakeLists.txt
+++ b/tests/auto/dummypositionplugin/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(DummyPluginForTests
OUTPUT_NAME qtposition_testplugin2
- TYPE position
+ PLUGIN_TYPE position
DEFAULT_IF FALSE
SOURCES
plugin.cpp
diff --git a/tests/auto/positionplugin/CMakeLists.txt b/tests/auto/positionplugin/CMakeLists.txt
index 9ed4bcd2..ed310874 100644
--- a/tests/auto/positionplugin/CMakeLists.txt
+++ b/tests/auto/positionplugin/CMakeLists.txt
@@ -6,7 +6,7 @@
qt_internal_add_plugin(QGeoPositionInfoSourceFactoryTest
OUTPUT_NAME qtposition_testplugin
- TYPE position
+ PLUGIN_TYPE position
DEFAULT_IF FALSE
SOURCES
plugin.cpp