summaryrefslogtreecommitdiff
path: root/src
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 /src
parent47dd71e249b6e2fe560592423f4b9d36d6919e50 (diff)
downloadqtsensors-1e6f2126f11a62813dd652d3df0edb8bff8dfbf1.tar.gz
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 'src')
-rw-r--r--src/plugins/CMakeLists.txt2
-rw-r--r--src/sensors/CMakeLists.txt12
-rw-r--r--src/sensors/doc/qtsensors.qdocconf11
-rw-r--r--src/sensors/doc/src/compatmap.qdoc2
-rw-r--r--src/sensors/doc/src/qt6-changes.qdoc6
-rw-r--r--src/sensors/doc/src/qtsensors.qdoc4
-rw-r--r--src/sensorsquick/CMakeLists.txt2
7 files changed, 25 insertions, 14 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index fdcb878..0da9670 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,2 +1,2 @@
add_subdirectory(sensors)
-add_subdirectory(sensorgestures)
+# add_subdirectory(sensorgestures)
diff --git a/src/sensors/CMakeLists.txt b/src/sensors/CMakeLists.txt
index beeda6a..1d1755c 100644
--- a/src/sensors/CMakeLists.txt
+++ b/src/sensors/CMakeLists.txt
@@ -3,13 +3,13 @@
#####################################################################
qt_internal_add_module(Sensors
- PLUGIN_TYPES sensors sensorgestures
+ 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
+ # 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
diff --git a/src/sensors/doc/qtsensors.qdocconf b/src/sensors/doc/qtsensors.qdocconf
index 5c5e943..0e83785 100644
--- a/src/sensors/doc/qtsensors.qdocconf
+++ b/src/sensors/doc/qtsensors.qdocconf
@@ -47,6 +47,17 @@ examplesinstallpath = sensors
imagedirs += images
+# Gestures have been disabled for the time being
+excludedirs += ../../../examples/sensors/qmlsensorgestures \
+ ../../../examples/sensors/shakeit \
+ ../../../examples/sensors/sensorgestures \
+ ../../plugins/sensorgestures \
+ ../../sensors/gestures
+
+excludefiles += ../../sensorsquick/qmlsensorgesture.cpp \
+ src/qtsensorgestures-cpp.qdoc \
+ src/qtsensorgestures-plugins.qdoc
+
depends += qtcore qtdoc qtgui qtquick
navigation.landingpage = "Qt Sensors"
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc
index f013c89..acb9819 100644
--- a/src/sensors/doc/src/compatmap.qdoc
+++ b/src/sensors/doc/src/compatmap.qdoc
@@ -165,6 +165,4 @@
a magnetometer might support returning geo values. See QSensor::isFeatureSupported() for
additional details.
- Sensor Gestures are mostly platform independent, and will run if the platform has the sensors required.
- Whether they are supported and work well or not depends on the platform.
*/
diff --git a/src/sensors/doc/src/qt6-changes.qdoc b/src/sensors/doc/src/qt6-changes.qdoc
index d8db18c..c82bf56 100644
--- a/src/sensors/doc/src/qt6-changes.qdoc
+++ b/src/sensors/doc/src/qt6-changes.qdoc
@@ -41,6 +41,12 @@
In this topic we summarize those changes in Qt Sensors, and provide
guidance to handle them.
+ \section1 Sensor Gesture support
+
+ The Gesture support has been removed. In its current shape the gestures
+ needs rethinking to be of more use for the developers. To track this please
+ see \l {https://bugreports.qt.io/browse/QTBUG-95649}{QTBUG-95649}.
+
\section1 Platform notes
\section2 Windows
diff --git a/src/sensors/doc/src/qtsensors.qdoc b/src/sensors/doc/src/qtsensors.qdoc
index b0f350e..fb805d8 100644
--- a/src/sensors/doc/src/qtsensors.qdoc
+++ b/src/sensors/doc/src/qtsensors.qdoc
@@ -32,7 +32,6 @@
\since 5.1
The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces.
- The Qt Sensors API also provides a motion gesture recognition API for devices.
Currently the API is supported on \l{Qt for Android}{Android},
\l{Qt for iOS}{iOS}, and \l {Qt for Windows}{Windows (MSVC)}.
@@ -75,9 +74,6 @@
\li \l{Qt Sensors C++ Overview}
\li High-level information on how to use the C++ API.
\row
- \li \l {Sensor Gestures C++ Overview}
- \li High-level information specific to sensor gestures
- \row
\li \l {Qt Sensors Examples}{Examples}
\li Examples demonstrating the use of the Qt Sensors APIs
\endtable
diff --git a/src/sensorsquick/CMakeLists.txt b/src/sensorsquick/CMakeLists.txt
index 6c247a6..304504a 100644
--- a/src/sensorsquick/CMakeLists.txt
+++ b/src/sensorsquick/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_qml_module(SensorsQuick
qmlproximitysensor.cpp qmlproximitysensor_p.h
qmlrotationsensor.cpp qmlrotationsensor_p.h
qmlsensor.cpp qmlsensor_p.h
- qmlsensorgesture.cpp qmlsensorgesture_p.h
+ # qmlsensorgesture.cpp qmlsensorgesture_p.h
qmlsensorglobal.cpp qmlsensorglobal_p.h
qmlsensorrange.cpp qmlsensorrange_p.h
qmltapsensor.cpp qmltapsensor_p.h