diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-18 09:12:34 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-18 15:16:42 +0200 |
commit | 01fea6e0d5a0ef709c1660e2420a842b90e6f85f (patch) | |
tree | 4d26c9f83d69560ac944e2c25b9bbef944f69576 | |
parent | 0f60374b5510642659f9778e47cb1204b0fd6ec7 (diff) | |
download | qtsensors-01fea6e0d5a0ef709c1660e2420a842b90e6f85f.tar.gz |
QtSensors: Fix compilation after merging of the api_changes branch.
Change-Id: I6d9f674eac15ad5f22de0e5631396c2c9eb1f19f
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
-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 a4c5b45..2b6105e 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 144d84a..53a8767 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"; |