6 files changed, 50 insertions, 55 deletions
diff --git a/src/plugins/sensorgestures/CMakeLists.txt b/src/plugins/sensorgestures/CMakeLists.txt
new file mode 100644
index 00000000..07fbacc9
--- /dev/null
+++ b/src/plugins/sensorgestures/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(shake)
+add_subdirectory(qtsensors)
diff --git a/src/plugins/sensorgestures/qtsensors/CMakeLists.txt b/src/plugins/sensorgestures/qtsensors/CMakeLists.txt
new file mode 100644
index 00000000..16b76086
--- /dev/null
+++ b/src/plugins/sensorgestures/qtsensors/CMakeLists.txt
@@ -0,0 +1,29 @@
+#####################################################################
+## QtSensorGesturePlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QtSensorGesturePlugin
+    OUTPUT_NAME qtsensorgestures_plugin
+    TYPE sensorgestures
+    DEFAULT_IF FALSE
+    SOURCES
+        qcoversensorgesturerecognizer.cpp qcoversensorgesturerecognizer.h
+        qdoubletapsensorgesturerecognizer.cpp qdoubletapsensorgesturerecognizer.h
+        qfreefallsensorgesturerecognizer.cpp qfreefallsensorgesturerecognizer.h
+        qhoversensorgesturerecognizer.cpp qhoversensorgesturerecognizer.h
+        qpickupsensorgesturerecognizer.cpp qpickupsensorgesturerecognizer.h
+        qshake2recognizer.cpp qshake2recognizer.h
+        qslamgesturerecognizer.cpp qslamgesturerecognizer.h
+        qtsensorgestureplugin.cpp qtsensorgestureplugin.h
+        qtsensorgesturesensorhandler.cpp qtsensorgesturesensorhandler.h
+        qturnoversensorgesturerecognizer.cpp qturnoversensorgesturerecognizer.h
+        qtwistsensorgesturerecognizer.cpp qtwistsensorgesturerecognizer.h
+        qwhipsensorgesturerecognizer.cpp qwhipsensorgesturerecognizer.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Sensors
+)
+
+#### Keys ignored in scope 1:.:.:qtsensors.pro:<TRUE>:
+# OTHER_FILES = "plugin.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
deleted file mode 100644
index 44f18ff5..00000000
--- a/src/plugins/sensorgestures/qtsensors/qtsensors.pro
+++ /dev/null
@@ -1,37 +0,0 @@
-TARGET = qtsensorgestures_plugin
-QT = core sensors
-
-# Input
-HEADERS += qtsensorgestureplugin.h \
-    qcoversensorgesturerecognizer.h \
-    qdoubletapsensorgesturerecognizer.h \
-    qhoversensorgesturerecognizer.h \
-    qfreefallsensorgesturerecognizer.h \
-    qpickupsensorgesturerecognizer.h \
-    qshake2recognizer.h \
-    qslamgesturerecognizer.h \
-    qturnoversensorgesturerecognizer.h \
-    qtwistsensorgesturerecognizer.h \
-    qwhipsensorgesturerecognizer.h \
-    qtsensorgesturesensorhandler.h
-
-SOURCES += qtsensorgestureplugin.cpp \
-    qcoversensorgesturerecognizer.cpp \
-    qdoubletapsensorgesturerecognizer.cpp \
-    qhoversensorgesturerecognizer.cpp \
-    qfreefallsensorgesturerecognizer.cpp \
-    qpickupsensorgesturerecognizer.cpp \
-    qshake2recognizer.cpp \
-    qslamgesturerecognizer.cpp \
-    qturnoversensorgesturerecognizer.cpp \
-    qtwistsensorgesturerecognizer.cpp \
-    qwhipsensorgesturerecognizer.cpp \
-    qtsensorgesturesensorhandler.cpp
-
-OTHER_FILES += \
-    plugin.json
-
-PLUGIN_TYPE = sensorgestures
-PLUGIN_CLASS_NAME = QtSensorGesturePlugin
-PLUGIN_EXTENDS = -
-load(qt_plugin)
diff --git a/src/plugins/sensorgestures/sensorgestures.pro b/src/plugins/sensorgestures/sensorgestures.pro
deleted file mode 100644
index 162fb8eb..00000000
--- a/src/plugins/sensorgestures/sensorgestures.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += shake qtsensors
diff --git a/src/plugins/sensorgestures/shake/CMakeLists.txt b/src/plugins/sensorgestures/shake/CMakeLists.txt
new file mode 100644
index 00000000..489881aa
--- /dev/null
+++ b/src/plugins/sensorgestures/shake/CMakeLists.txt
@@ -0,0 +1,19 @@
+#####################################################################
+## QShakeSensorGesturePlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QShakeSensorGesturePlugin
+    OUTPUT_NAME qtsensorgestures_shakeplugin
+    TYPE sensorgestures
+    DEFAULT_IF FALSE
+    SOURCES
+        qshakerecognizer.cpp qshakerecognizer.h
+        qshakesensorgestureplugin.cpp qshakesensorgestureplugin.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Sensors
+)
+
+#### Keys ignored in scope 1:.:.:shake.pro:<TRUE>:
+# OTHER_FILES = "plugin.json"
+# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro
deleted file mode 100644
index efa2a0cb..00000000
--- a/src/plugins/sensorgestures/shake/shake.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TARGET = qtsensorgestures_shakeplugin
-QT = core sensors
-
-# Input
-HEADERS += qshakesensorgestureplugin.h \
-           qshakerecognizer.h
-SOURCES += qshakesensorgestureplugin.cpp \
-           qshakerecognizer.cpp
-
-OTHER_FILES += \
-    plugin.json
-
-PLUGIN_TYPE = sensorgestures
-PLUGIN_CLASS_NAME = QShakeSensorGesturePlugin
-PLUGIN_EXTENDS = -
-load(qt_plugin)