summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-08-09 12:09:21 +0300
committerJuha Vuolle <juha.vuolle@insta.fi>2021-08-16 12:20:32 +0300
commit1e6f2126f11a62813dd652d3df0edb8bff8dfbf1 (patch)
tree00ff952befa84b6de8176037ee1fab74ef60e915 /tests
parent47dd71e249b6e2fe560592423f4b9d36d6919e50 (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 Pick-to: 6.2 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>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/CMakeLists.txt10
-rw-r--r--tests/auto/qml/qml_cpp/CMakeLists.txt4
-rw-r--r--tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp7
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