diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-21 10:01:56 +0300 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-05-26 09:48:04 +0300 |
| commit | 0193d164e79845f7a2b5a388ed2818854c77399f (patch) | |
| tree | 68d05a426a53d39c0bce34705dd91fbbbc9c24e5 /tests | |
| parent | cf21f9074be72e9d5a1c45638bf6762edad7a73f (diff) | |
Split the Sensors QML plugin into a library and a plugin
The main changes:
- Introduction of new SensorsQuick library with private exports
- The original QML plugin loads this new library and does little else
- Renamed original 'sensors' plugin as 'declarative_sensors' to provide
an idea what it relates to
- Renamed library headers as private "_p.h" and added "We mean it"
- Changed qmlRegister* calls to QML_ELEMENT macros
- Removed files that are generated in Qt6 (qmldir, plugins.qmltypes)
Task-number: QTBUG-92530
Change-Id: I18f849adabcc79ac47e67305f78aefeee82801bc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/sensors2qmlapi/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/sensors2qmlapi/CMakeLists.txt b/tests/auto/sensors2qmlapi/CMakeLists.txt index 8e1a0ccf..075cdc35 100644 --- a/tests/auto/sensors2qmlapi/CMakeLists.txt +++ b/tests/auto/sensors2qmlapi/CMakeLists.txt @@ -4,9 +4,6 @@ qt_internal_add_test(tst_sensors2qmlapi SOURCES - ../../../src/imports/sensors/qmlsensor.cpp ../../../src/imports/sensors/qmlsensor.h - ../../../src/imports/sensors/qmlsensorgesture.cpp ../../../src/imports/sensors/qmlsensorgesture.h - ../../../src/imports/sensors/qmlsensorrange.cpp ../../../src/imports/sensors/qmlsensorrange.h qtemplategestureplugin.cpp qtemplategestureplugin.h qtemplaterecognizer.cpp qtemplaterecognizer.h tst_sensors2qmlapi.cpp @@ -14,4 +11,5 @@ qt_internal_add_test(tst_sensors2qmlapi Qt::Qml LIBRARIES Qt::SensorsPrivate + Qt::SensorsQuickPrivate ) diff --git a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp index 51007fcb..91f51159 100644 --- a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp +++ b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp @@ -30,8 +30,8 @@ #include <QtTest/QSignalSpy> #include <QtCore/QDebug> -#include "../../../src/imports/sensors/qmlsensor.h" -#include "../../../src/imports/sensors/qmlsensorgesture.h" +#include "../../../src/sensorsquick/qmlsensor_p.h" +#include "../../../src/sensorsquick/qmlsensorgesture_p.h" #include "qtemplategestureplugin.h" #include "qtemplaterecognizer.h" |