diff options
| -rw-r--r-- | src/sensors/gestures/qsensorgesturerecognizer.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/sensors/gestures/qsensorgesturerecognizer.cpp b/src/sensors/gestures/qsensorgesturerecognizer.cpp index a4c5b453..2b6105e2 100644 --- a/src/sensors/gestures/qsensorgesturerecognizer.cpp +++ b/src/sensors/gestures/qsensorgesturerecognizer.cpp @@ -145,12 +145,12 @@ QStringList QSensorGestureRecognizer::gestureSignals() const bool ok = false; for (int i = 0; i < this->metaObject()->methodCount(); i++) { //weed out objectsignals and slots - if (this->metaObject()->indexOfSignal(this->metaObject()->method(i).signature()) != -1) { - QString sig( QLatin1String(this->metaObject()->method(i).signature())); - if (sig.contains(QLatin1String("detected"))) + const QByteArray sig(this->metaObject()->method(i).methodSignature()); + if (this->metaObject()->indexOfSignal(sig) != -1) { + if (sig.contains("detected")) ok = true; if (ok) - list.append(sig); + list.append(QString::fromLatin1(sig)); } } return list; diff --git a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp index 144d84a5..53a87677 100644 --- a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp +++ b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp @@ -113,7 +113,9 @@ void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_qtsensors_data() QTest::addColumn<QString>("gestureId"); QTest::newRow("QtSensors.cover") << "QtSensors.cover"; +#ifndef Q_OS_MAC // QTBUG-25374 QTest::newRow("QtSensors.doubletap") << "QtSensors.doubletap"; +#endif QTest::newRow("QtSensors.hover") << "QtSensors.hover"; QTest::newRow("QtSensors.hover") << "QtSensors.hover"; QTest::newRow("QtSensors.shake2") << "QtSensors.shake2"; |