Port QtSensors to new QML CMake API

Change-Id: I73ad44222b2ecefca4457b5dd1713207dc515223
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

5 files changed, 3 insertions, 91 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb87443e..073eaeaa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,5 +2,4 @@ add_subdirectory(sensors)
 add_subdirectory(plugins)
 if(TARGET Qt::Quick)
     add_subdirectory(sensorsquick)
-    add_subdirectory(imports)
 endif()
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
deleted file mode 100644
index 3fdc4441..00000000
--- a/src/imports/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-add_subdirectory(sensors)
diff --git a/src/imports/sensors/CMakeLists.txt b/src/imports/sensors/CMakeLists.txt
deleted file mode 100644
index d20add31..00000000
--- a/src/imports/sensors/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-qt_internal_add_qml_module(declarative_sensors
-    URI "QtSensors"
-    VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtSensorsDeclarativeModule
-    SKIP_TYPE_REGISTRATION
-    PLUGIN_OPTIONAL
-    SOURCES
-        sensors.cpp
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Qml
-    LIBRARIES
-        Qt::SensorsQuickPrivate
-)
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
deleted file mode 100644
index 3244707b..00000000
--- a/src/imports/sensors/sensors.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 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 <QtSensorsQuick/private/qsensorsquickglobal_p.h>
-#include <QtQml/qqmlextensionplugin.h>
-#include <QtQml/qqml.h>
-
-QT_BEGIN_NAMESPACE
-
-class QSensorsQuickPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    QSensorsQuickPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
-    void registerTypes(const char *) override
-    {
-        // Build-time generated registration function
-        volatile auto registration = &qml_register_types_QtSensors;
-        Q_UNUSED(registration);
-    }
-};
-
-QT_END_NAMESPACE
-
-#include "sensors.moc"
diff --git a/src/sensorsquick/CMakeLists.txt b/src/sensorsquick/CMakeLists.txt
index 703974e1..87a951a5 100644
--- a/src/sensorsquick/CMakeLists.txt
+++ b/src/sensorsquick/CMakeLists.txt
@@ -1,4 +1,6 @@
-qt_internal_add_module(SensorsQuick
+qt_internal_add_qml_module(SensorsQuick
+    URI "QtSensors"
+    VERSION "${PROJECT_VERSION}"
     SOURCES
         qmlaccelerometer.cpp qmlaccelerometer_p.h
         qmlaltimeter.cpp qmlaltimeter_p.h
@@ -33,13 +35,3 @@ qt_internal_add_module(SensorsQuick
     LIBRARIES
         Qt::CorePrivate
 )
-
-set_target_properties(SensorsQuick PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
-    QT_QML_MODULE_VERSION ${PROJECT_VERSION}
-    QT_QML_MODULE_URI QtSensors
-    QT_QMLTYPES_FILENAME plugins.qmltypes
-    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtSensors"
-)
-
-qt6_qml_type_registration(SensorsQuick)