diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-08-09 12:09:21 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-16 10:37:58 +0000 |
| commit | 5991224e6713eef4a456c408fcf797662fa2a66c (patch) | |
| tree | e02b6b093cf5d7cf2b404ea47678898dfc500431 /tests/auto | |
| parent | c91828e810b1f0f3fa2c2145bdfeb52d8cfac9d1 (diff) | |
Disable gestures from QtSensors
The sensor gestures requires some rethinking in order to be
of more use for the developers. Therefore we should not
yet commit to the old API at least in the first Qt 6
sensors release.
This commit disables the gestures by:
- Excluding gesture code from compilation
- Excluding gesture examples and tests from compilation
- Excluding the gesture related documentation
- And updating the Qt 6 porting guide
Task-number: QTBUG-95747
Task-number: QTBUG-95649
Change-Id: I33c1e010825a88b10fa1f7ad49ad3b5383b470aa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
(cherry picked from commit 1e6f2126f11a62813dd652d3df0edb8bff8dfbf1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tests/auto/qml/qml_cpp/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index c325e2f7..1963e207 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,10 +1,10 @@ add_subdirectory(qsensor) -add_subdirectory(qsensorgestures) -add_subdirectory(qsensorgestureplugins) add_subdirectory(cmake) if(TARGET Qt::Quick) add_subdirectory(qml) endif() -if(UNIX AND NOT APPLE) - add_subdirectory(qsensorgestures_gestures) -endif() +# add_subdirectory(qsensorgestures) +# add_subdirectory(qsensorgestureplugins) +# if(UNIX AND NOT APPLE) +# add_subdirectory(qsensorgestures_gestures) +# endif() diff --git a/tests/auto/qml/qml_cpp/CMakeLists.txt b/tests/auto/qml/qml_cpp/CMakeLists.txt index 45c3230d..b03ab37e 100644 --- a/tests/auto/qml/qml_cpp/CMakeLists.txt +++ b/tests/auto/qml/qml_cpp/CMakeLists.txt @@ -1,8 +1,8 @@ qt_internal_add_test(tst_sensors_qmlcpp SOURCES ../../common/test_backends.cpp ../../common/test_backends.h - qtemplategestureplugin.cpp qtemplategestureplugin.h - qtemplaterecognizer.cpp qtemplaterecognizer.h + # qtemplategestureplugin.cpp qtemplategestureplugin.h + # qtemplaterecognizer.cpp qtemplaterecognizer.h tst_sensors_qmlcpp.cpp LIBRARIES Qt::Qml diff --git a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp index 57cd0cb1..d86045b2 100644 --- a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp +++ b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp @@ -32,7 +32,7 @@ #include <QtTest/private/qpropertytesthelper_p.h> #include <QtSensorsQuick/private/qmlsensor_p.h> -#include <QtSensorsQuick/private/qmlsensorgesture_p.h> +// #include <QtSensorsQuick/private/qmlsensorgesture_p.h> #include "qtemplategestureplugin.h" #include "qtemplaterecognizer.h" @@ -69,7 +69,7 @@ class tst_sensors_qmlcpp : public QObject private slots: void initTestCase(); void testReadingBindings(); - void testGesture(); + // void testGesture(); void testSensorRanges(); }; @@ -195,6 +195,7 @@ void tst_sensors_qmlcpp::testReadingBindings() unregister_test_backends(); } +/* void tst_sensors_qmlcpp::testGesture() { QTemplateGesturePlugin* plugin = new QTemplateGesturePlugin(); @@ -311,6 +312,8 @@ void tst_sensors_qmlcpp::testGesture() QCOMPARE(spy2_detected.count(), 1); } +*/ + class QDummySensorBackend : public QSensorBackend { Q_OBJECT |