QtSensors initial cmake support

This commit introduces the bare minimum cmake support that should
unblock the CI and allow further verification and development on most
platforms: macOS, Linux, Win, iOS and Android.

Some clarifications:
* The support for sensorfw backend is very preliminary and can
  be enabled later if needed (no Qt6 version of the sensorfw).
* The simulator backend is dropped as obsolete / unnecessary.
* Three examples are currently commented out and shall be ported with
  a later commit.

Task-number: QTBUG-92502
Change-Id: Id523d43ed3ef177010dc73afc5812ed374cff0dd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

15 files changed, 206 insertions, 414 deletions

diff --git a/src/sensors/CMakeLists.txt b/src/sensors/CMakeLists.txt
new file mode 100644
index 00000000..4a687b48
--- /dev/null
+++ b/src/sensors/CMakeLists.txt
@@ -0,0 +1,108 @@
+#####################################################################
+## Sensors Module:
+#####################################################################
+
+qt_internal_add_module(Sensors
+    PLUGIN_TYPES sensors sensorgestures
+    SOURCES
+    gestures/qsensorgesture.cpp gestures/qsensorgesture.h gestures/qsensorgesture_p.h
+    gestures/qsensorgesturemanager.cpp gestures/qsensorgesturemanager.h
+    gestures/qsensorgesturemanagerprivate.cpp gestures/qsensorgesturemanagerprivate_p.h
+    gestures/qsensorgestureplugininterface.cpp gestures/qsensorgestureplugininterface.h
+    gestures/qsensorgesturerecognizer.cpp gestures/qsensorgesturerecognizer.h
+    qsensorbackend.cpp qsensorbackend.h
+    qsensormanager.cpp qsensormanager.h
+    qsensorplugin.cpp qsensorplugin.h
+    qsensorsglobal.h
+    sensorlog_p.h
+    qsensor.h
+    qaccelerometer.h
+    qaltimeter.h
+    qambientlightsensor.h
+    qambienttemperaturesensor.h
+    qcompass.h
+    qdistancesensor.h
+    qholstersensor.h
+    qlightsensor.h
+    qmagnetometer.h
+    qorientationsensor.h
+    qproximitysensor.h
+    qirproximitysensor.h
+    qrotationsensor.h
+    qtapsensor.h
+    qtiltsensor.h
+    qgyroscope.h
+    qpressuresensor.h
+    qhumiditysensor.h
+    qlidsensor.h
+    qsensor_p.h
+    qaccelerometer_p.h
+    qaltimeter_p.h
+    qambientlightsensor_p.h
+    qambienttemperaturesensor_p.h
+    qcompass_p.h
+    qdistancesensor_p.h
+    qholstersensor_p.h
+    qlightsensor_p.h
+    qmagnetometer_p.h
+    qorientationsensor_p.h
+    qproximitysensor_p.h
+    qirproximitysensor_p.h
+    qrotationsensor_p.h
+    qtapsensor_p.h
+    qtiltsensor_p.h
+    qgyroscope_p.h
+    qpressuresensor_p.h
+    qhumiditysensor_p.h
+    qlidsensor_p.h
+    qsensor.cpp
+    qaccelerometer.cpp
+    qaltimeter.cpp
+    qambientlightsensor.cpp
+    qambienttemperaturesensor.cpp
+    qcompass.cpp
+    qdistancesensor.cpp
+    qholstersensor.cpp
+    qlightsensor.cpp
+    qmagnetometer.cpp
+    qorientationsensor.cpp
+    qproximitysensor.cpp
+    qirproximitysensor.cpp
+    qrotationsensor.cpp
+    qtapsensor.cpp
+    qtiltsensor.cpp
+    qgyroscope.cpp
+    qpressuresensor.cpp
+    qhumiditysensor.cpp
+    qlidsensor.cpp
+    DEFINES
+        $<$<CONFIG:Debug>:ENABLE_RUNTIME_SENSORLOG>
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+)
+
+if(ANDROID)
+    set_property(TARGET Sensors APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
+        plugins/sensors/libplugins_sensors_qtsensors_android.so
+    )
+endif()
+
+#### Keys ignored in scope 1:.:.:sensors.pro:<TRUE>:
+# SENSORS = "qsensor" "qaccelerometer" "qaltimeter" "qambientlightsensor" "qambienttemperaturesensor" "qcompass" "qdistancesensor" "qholstersensor" "qlightsensor" "qmagnetometer" "qorientationsensor" "qproximitysensor" "qirproximitysensor" "qrotationsensor" "qtapsensor" "qtiltsensor" "qgyroscope" "qpressuresensor" "qhumiditysensor" "qlidsensor"
+
+## Scopes:
+#####################################################################
+
+qt_internal_extend_target(Sensors CONDITION NOT SENSORS_CONFIG_PATH
+    DEFINES
+        QTSENSORS_CONFIG_PATH="${SENSORS_CONFIG_PATH}"
+)
+
+qt_internal_add_docs(Sensors
+    doc/qtsensors.qdocconf
+)
+
diff --git a/src/sensors/configure.cmake b/src/sensors/configure.cmake
new file mode 100644
index 00000000..06e0de59
--- /dev/null
+++ b/src/sensors/configure.cmake
@@ -0,0 +1,38 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+# special case begin
+if (LINUX)
+    qt_find_package(Sensorfw PROVIDED_TARGETS Sensorfw::Sensorfw MODULE_NAME sensors QMAKE_LIB sensorfw)
+endif()
+# special case end
+
+#### Tests
+
+
+
+#### Features
+
+# special case begin
+qt_feature("sensorfw" PRIVATE
+    LABEL "sensorfw"
+    CONDITION Sensorfw_FOUND
+)
+# special case end
+
+qt_configure_add_summary_section(NAME "Qt Sensors")
+if (LINUX)
+    # At the moment there is no Qt6 version of sensorfw, and while the
+    # FindSensorfw.cmake in this repo would find the package using pkg-config,
+    # it would not work. Once the Qt6 version exists, remove the
+    # "sensorfw_enabled_with_cmake" entry, enable build in
+    # src/plugins/sensors/CMakeLists.txt and fix any potential errors.
+    qt_configure_add_summary_entry(ARGS "sensorfw")
+    qt_configure_add_summary_entry(ARGS "sensorfw_enabled_with_cmake")
+    qt_configure_add_report(MESSAGE "SensorFW support currently not enabled with cmake")
+endif()
+qt_configure_end_summary_section() # end of "Qt Sensors" section
diff --git a/src/sensors/doc/snippets/sensorgestures/CMakeLists.txt b/src/sensors/doc/snippets/sensorgestures/CMakeLists.txt
new file mode 100644
index 00000000..eb46a95c
--- /dev/null
+++ b/src/sensors/doc/snippets/sensorgestures/CMakeLists.txt
@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 3.14)
+project(sensorgesturessdocsnippet LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt6 COMPONENTS Core Sensors)
+
+qt_add_executable(sensorgesturessdocsnippet
+    creating.cpp
+    main.cpp
+    myplugin.h
+    plugin.cpp
+)
+
+target_link_libraries(sensorgesturessdocsnippet PUBLIC
+        Qt::Sensors
+)
+
+if (GCC AND UNIX)
+    target_link_libraries(sensorgesturessdocsnippet PUBLIC
+        rdynamic
+        log
+    )
+endif()
diff --git a/src/sensors/doc/snippets/sensorgestures/sensorgestures.pro b/src/sensors/doc/snippets/sensorgestures/sensorgestures.pro
deleted file mode 100644
index 7442dd87..00000000
--- a/src/sensors/doc/snippets/sensorgestures/sensorgestures.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE=app
-TARGET=sensorgesturessdocsnippet
-QT = core sensors
-SOURCES+=main.cpp\
-    creating.cpp\
-    plugin.cpp
-HEADERS+=myplugin.h
-!win32:*g++*:LIBS+=-rdynamic
diff --git a/src/sensors/doc/snippets/sensors/CMakeLists.txt b/src/sensors/doc/snippets/sensors/CMakeLists.txt
new file mode 100644
index 00000000..a5c35e35
--- /dev/null
+++ b/src/sensors/doc/snippets/sensors/CMakeLists.txt
@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 3.14)
+project(sensorsdocsnippet LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt6 COMPONENTS Core Sensors)
+
+qt_add_executable(sensorsdocsnippet
+    creating.cpp
+    main.cpp
+    mybackend.h
+    plugin.cpp
+)
+
+target_link_libraries(sensorsdocsnippet PUBLIC
+        Qt::Sensors
+)
+
+if (GCC AND UNIX)
+    target_link_libraries(sensorsdocsnippet PUBLIC
+        rdynamic
+        log
+    )
+endif()
diff --git a/src/sensors/doc/snippets/sensors/sensors.pro b/src/sensors/doc/snippets/sensors/sensors.pro
deleted file mode 100644
index 91d49772..00000000
--- a/src/sensors/doc/snippets/sensors/sensors.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE=app
-TARGET=sensorsdocsnippet
-QT = core sensors
-SOURCES+=main.cpp\
-    creating.cpp\
-    start.cpp\
-    plugin.cpp
-HEADERS+=mybackend.h
-!win32:*g++*:LIBS+=-rdynamic
-OTHER_FILES += *.qml
diff --git a/src/sensors/doc/snippets/snippets.pro b/src/sensors/doc/snippets/snippets.pro
deleted file mode 100644
index f73d4a35..00000000
--- a/src/sensors/doc/snippets/snippets.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += sensors
-SUBDIRS += sensorgestures
-
diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
index 81e87de0..09b068d6 100644
--- a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
+++ b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp
@@ -46,10 +46,6 @@
 #include "qsensorgesturemanagerprivate_p.h"
 #include "qsensorgestureplugininterface.h"
 
-#ifdef SIMULATOR_BUILD
-#include "simulatorgesturescommon_p.h"
-#endif
-
 Q_GLOBAL_STATIC(QSensorGestureManagerPrivate, sensorGestureManagerPrivate)
 
 QT_BEGIN_NAMESPACE
@@ -57,18 +53,6 @@ QT_BEGIN_NAMESPACE
 QSensorGestureManagerPrivate::QSensorGestureManagerPrivate(QObject *parent) :
     QObject(parent)
 {
-#ifdef SIMULATOR_BUILD
-    SensorGesturesConnection *connection =  new SensorGesturesConnection(this);
-    connect(connection,SIGNAL(sensorGestureDetected()),
-            this,SLOT(sensorGestureDetected()));
-
-    connect(this,SIGNAL(newSensorGestures(QStringList)),
-            connection,SLOT(newSensorGestures(QStringList)));
-
-    connect(this,SIGNAL(removeSensorGestures(QStringList)),
-            connection,SLOT(removeSensorGestures(QStringList)));
-#endif
-
     loader = new QFactoryLoader("org.qt-project.QSensorGesturePluginInterface", QLatin1String("/sensorgestures"));
     loadPlugins();
 }
@@ -189,49 +173,6 @@ QStringList QSensorGestureManagerPrivate::gestureIds()
     return knownIds;
 }
 
-#ifdef SIMULATOR_BUILD
-void QSensorGestureManagerPrivate::sensorGestureDetected()
-{
-    QString str = get_qtSensorGestureData();
-
-    Q_FOREACH (const QString &id, gestureIds()) {
-        QSensorGestureRecognizer *recognizer = sensorGestureRecognizer(id);
-        if (recognizer != 0) {
-            Q_FOREACH (const QString &sig,  recognizer->gestureSignals()) {
-                if (!sig.contains(QLatin1String("detected"))) { //weed out detected signals
-                    QString tmp;
-                        tmp = sig.left(sig.length() - 2);
-                    if (str == tmp) {
-                        // named signal for c++
-                        QMetaObject::invokeMethod(recognizer, str.toLocal8Bit(), Qt::DirectConnection);
-                        // detected signal for qml and c++
-                        QMetaObject::invokeMethod(recognizer, "detected", Qt::DirectConnection,
-                                                  Q_ARG(QString, str));
-                        break;
-
-                    }
-                }
-            }
-        }
-    }
-}
-
-void QSensorGestureManagerPrivate::recognizerStarted(const QSensorGestureRecognizer *recognizer)
-{
-    QStringList list = recognizer->gestureSignals();
-    list.removeOne(QLatin1String("detected(QString)"));
-    Q_EMIT newSensorGestures(list);
-}
-
-void QSensorGestureManagerPrivate::recognizerStopped(const QSensorGestureRecognizer *recognizer)
-{
-    QStringList list = recognizer->gestureSignals();
-    list.removeOne(QLatin1String("detected(QString)"));
-    Q_EMIT removeSensorGestures(list);
-}
-
-#endif
-
 QSensorGestureManagerPrivate * QSensorGestureManagerPrivate::instance()
 {
     QSensorGestureManagerPrivate *priv = sensorGestureManagerPrivate();
diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
index 2ca4d648..e57ede49 100644
--- a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
+++ b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
@@ -86,24 +86,10 @@ public:
     QStringList gestureIds();
     QStringList knownIds;
     void initPlugin(QObject *o);
-#ifdef SIMULATOR_BUILD
-    void recognizerStarted(const QSensorGestureRecognizer *);
-    void recognizerStopped(const QSensorGestureRecognizer *);
-#endif
 
     static QSensorGestureManagerPrivate * instance();
 Q_SIGNALS:
         void newSensorGestureAvailable();
-
-#ifdef SIMULATOR_BUILD
-Q_SIGNALS:
-    void newSensorGestures(QStringList);
-    void removeSensorGestures(QStringList);
-
-private slots:
-    void sensorGestureDetected();
-
-#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/sensors/gestures/qsensorgesturerecognizer.cpp b/src/sensors/gestures/qsensorgesturerecognizer.cpp
index c992ac01..d9a367eb 100644
--- a/src/sensors/gestures/qsensorgesturerecognizer.cpp
+++ b/src/sensors/gestures/qsensorgesturerecognizer.cpp
@@ -39,11 +39,8 @@
 
 #include "qsensorgesturerecognizer.h"
 #include "qsensorgesture_p.h"
-
 #include "qsensorgesturemanager.h"
-#ifdef SIMULATOR_BUILD
-#include "qsensorgesturemanagerprivate_p.h"
-#endif
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -187,12 +184,8 @@ void QSensorGestureRecognizer::startBackend()
         qWarning() << "Not starting. Gesture Recognizer not initialized";
         return;
     }
-  if (d_ptr->count++ == 0) {
+  if (d_ptr->count++ == 0)
       start();
-#ifdef SIMULATOR_BUILD
-      QSensorGestureManagerPrivate::instance()->recognizerStarted(this);
-#endif
-  }
 }
 
 /*!
@@ -207,12 +200,8 @@ void QSensorGestureRecognizer::stopBackend()
         qWarning() << "Not stopping. Gesture Recognizer not initialized";
         return;
     }
-    if (--d_ptr->count == 0) {
+    if (--d_ptr->count == 0)
         stop();
-#ifdef SIMULATOR_BUILD
-        QSensorGestureManagerPrivate::instance()->recognizerStopped(this);
-#endif
-    }
 }
 
 QT_END_NAMESPACE
diff --git a/src/sensors/gestures/simulatorgesturescommon.cpp b/src/sensors/gestures/simulatorgesturescommon.cpp
deleted file mode 100644
index b7860423..00000000
--- a/src/sensors/gestures/simulatorgesturescommon.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "simulatorgesturescommon_p.h"
-
-#include <QtSimulator/version.h>
-#include <QtSimulator/QtSimulator>
-
-#include <QDebug>
-#include <QStringList>
-
-using namespace Simulator;
-
-
-Q_GLOBAL_STATIC(QString, qtSensorGestureData)
-
-SensorGesturesConnection::SensorGesturesConnection(QObject *parent)
-    : QObject(parent)
-{
-    mConnection = new Connection(Connection::Client, QLatin1String("QtSimulator_Mobility_ServerName1.3.0.0"),
-                                 0xbeef+1, Version(1,0,0,0), this);
-    mWorker = mConnection->connectToServer(Connection::simulatorHostName(true), 0xbeef+1);
-
-    if (!mWorker) {
-        qWarning() << "Could not connect to server";
-        return;
-    }
-
-    mWorker->addReceiver(this);
-    mWorker->call("setRequestsSensorGestures");
-}
-
-SensorGesturesConnection::~SensorGesturesConnection()
-{
-    mWorker->call("setSensorGestures", QStringList());
-    delete mWorker;
-}
-
-void SensorGesturesConnection::setSensorGestureData(const QString &data)
-{
-    QString gesture = data;
-    if (data.contains(QLatin1String("detected"))) {
-            gesture.remove(QLatin1String("detected("));
-            gesture.remove(QLatin1String(")"));
-    }
-    *qtSensorGestureData() = gesture;
-}
-
-void SensorGesturesConnection::newSensorGestureDetected()
-{
-    emit sensorGestureDetected();
-}
-
-void SensorGesturesConnection::newSensorGestures(const QStringList &gestures)
-{
-    if (!mWorker) return;
-
-    Q_FOREACH (const QString &gest, gestures) {
-        if (!gest.contains(QLatin1String("detected"))) {
-            QString tmp = gest.left(gest.length()-2);
-            if (!allGestures.contains(tmp)) {
-                allGestures.append(tmp);
-            }
-        }
-    }
-
-    mWorker->call("setSensorGestures", allGestures);
-}
-
-void SensorGesturesConnection::removeSensorGestures(const QStringList &gestures)
-{
-    Q_FOREACH (const QString &gest, gestures) {
-        QString tmp = gest.left(gest.length()-2);
-        if (allGestures.contains(tmp)) {
-            allGestures.removeOne(tmp);
-        }
-    }
-    mWorker->call("setSensorGestures", allGestures);
-}
-
-QString get_qtSensorGestureData()
-{
-    return *qtSensorGestureData();
-}
-
diff --git a/src/sensors/gestures/simulatorgesturescommon_p.h b/src/sensors/gestures/simulatorgesturescommon_p.h
deleted file mode 100644
index 63022238..00000000
--- a/src/sensors/gestures/simulatorgesturescommon_p.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSensors module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef SIMULATORGESTURESCOMMON_H
-#define SIMULATORGESTURESCOMMON_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtSimulator/connection.h>
-#include <QtSimulator/connectionworker.h>
-#include <QStringList>
-
-class QTimer;
-
-namespace Simulator
-{
-    class Connection;
-    class ConnectionWorker;
-}
-
-class SensorGesturesConnection : public QObject
-{
-    Q_OBJECT
-public:
-    explicit SensorGesturesConnection(QObject *parent = 0);
-    virtual ~SensorGesturesConnection();
-
-Q_SIGNALS:
-    void sensorGestureDetected();
-
-public slots:
-    void setSensorGestureData(const QString &);
-    void newSensorGestureDetected();
-    void newSensorGestures(const QStringList &gestures);
-    void removeSensorGestures(const QStringList &gestures);
-
-private:
-    Simulator::Connection *mConnection;
-    Simulator::ConnectionWorker *mWorker;
-    QStringList allGestures;
-
-};
-
-QString get_qtSensorGestureData();
-
-#endif //SIMULATORGESTURESCOMMON_H
-
diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp
index d8bb0bee..ef1ef523 100644
--- a/src/sensors/qsensor.cpp
+++ b/src/sensors/qsensor.cpp
@@ -1362,7 +1362,7 @@ void QSensorReading::copyValuesFrom(QSensorReading *other)
     \code
     class MyReading : public QSensorReading
     {
-        Q_OBJECT
+        \Q_OBJECT
         Q_PROPERTY(qreal myprop READ myprop)
         DECLARE_READING(MyReading)
     public:
@@ -1390,6 +1390,3 @@ void QSensorReading::copyValuesFrom(QSensorReading *other)
 */
 
 QT_END_NAMESPACE
-
-#include "moc_qsensor.cpp"
-
diff --git a/src/sensors/qt_cmdline.cmake b/src/sensors/qt_cmdline.cmake
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/sensors/qt_cmdline.cmake
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
deleted file mode 100644
index 79cb6e45..00000000
--- a/src/sensors/sensors.pro
+++ /dev/null
@@ -1,87 +0,0 @@
-TARGET = QtSensors
-CONFIG += strict_flags
-QT = core-private
-
-CONFIG(debug,debug|release):DEFINES += ENABLE_RUNTIME_SENSORLOG
-!isEmpty(SENSORS_CONFIG_PATH):DEFINES += "QTSENSORS_CONFIG_PATH=\\\"$$SENSORS_CONFIG_PATH\\\""
-
-qtHaveModule(simulator) {
-    DEFINES += SIMULATOR_BUILD
-    QT_FOR_PRIVATE += simulator
-}
-
-QMAKE_DOCS = $$PWD/doc/qtsensors.qdocconf
-
-ANDROID_LIB_DEPENDENCIES = \
-    plugins/sensors/libplugins_sensors_qtsensors_android.so
-
-PUBLIC_HEADERS += \
-           qsensorbackend.h\
-           qsensormanager.h\
-           qsensorplugin.h\
-           qsensorsglobal.h
-
-PRIVATE_HEADERS += \
-           sensorlog_p.h\
-
-SOURCES += qsensorbackend.cpp\
-           qsensormanager.cpp\
-           qsensorplugin.cpp
-
-SOURCES += \
-    gestures/qsensorgesture.cpp \
-    gestures/qsensorgesturerecognizer.cpp \
-    gestures/qsensorgesturemanager.cpp \
-    gestures/qsensorgesturemanagerprivate.cpp \
-    gestures/qsensorgestureplugininterface.cpp
-
-GESTURE_HEADERS += \
-    gestures/qsensorgesture.h\
-    gestures/qsensorgesture_p.h\
-    gestures/qsensorgesturerecognizer.h \
-    gestures/qsensorgesturemanager.h \
-    gestures/qsensorgesturemanagerprivate_p.h \
-    gestures/qsensorgestureplugininterface.h
-
-qtHaveModule(simulator) {
-    SOURCES += gestures/simulatorgesturescommon.cpp
-    GESTURE_HEADERS += gestures/simulatorgesturescommon_p.h
-}
-
-# 3 files per sensor (including QSensor)
-SENSORS=\
-    qsensor\
-    qaccelerometer\
-    qaltimeter\
-    qambientlightsensor\
-    qambienttemperaturesensor\
-    qcompass\
-    qdistancesensor\
-    qholstersensor\
-    qlightsensor\
-    qmagnetometer\
-    qorientationsensor\
-    qproximitysensor\
-    qirproximitysensor\
-    qrotationsensor\
-    qtapsensor\
-    qtiltsensor\
-    qgyroscope\
-    qpressuresensor \
-    qhumiditysensor \
-    qlidsensor
-
-for(s,SENSORS) {
-    # Client API
-    PUBLIC_HEADERS += $${s}.h
-    SOURCES        += $${s}.cpp
-    # Private header
-    PRIVATE_HEADERS += $${s}_p.h
-}
-
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$GESTURE_HEADERS
-
-MODULE_PLUGIN_TYPES = \
-    sensors \
-    sensorgestures
-load(qt_module)