summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--tests/auto/qsensor/tst_qsensor.cpp28
-rw-r--r--tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp4
-rw-r--r--tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp14
4 files changed, 24 insertions, 24 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 16328b7d..e28797de 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.3.0
+MODULE_VERSION = 5.4.0
diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp
index ce5f8e36..72b30d4e 100644
--- a/tests/auto/qsensor/tst_qsensor.cpp
+++ b/tests/auto/qsensor/tst_qsensor.cpp
@@ -221,7 +221,7 @@ private slots:
QByteArray actual = sensor.identifier();
QCOMPARE(actual, expected);
- QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensor::setIdentifier while connected to a backend! ");
+ QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensor::setIdentifier while connected to a backend!");
sensor.setIdentifier("dummy.accelerometer");
expected = testsensorimpl::id;
actual = sensor.identifier();
@@ -232,7 +232,7 @@ private slots:
{
QSensorManager::setDefaultBackend(QByteArray(TestSensor::type), QByteArray("test sensor 2"));
TestSensor sensor;
- QTest::ignoreMessage(QtWarningMsg, "Can't create backend \"test sensor 2\" ");
+ QTest::ignoreMessage(QtWarningMsg, "Can't create backend \"test sensor 2\"");
sensor.connectToBackend();
QByteArray expected = testsensorimpl::id;
QByteArray actual = sensor.identifier();
@@ -378,14 +378,14 @@ private slots:
{
TestSensor sensor;
sensor.setProperty("doThis", "rates(0)");
- QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensorBackend::setDataRates with 0 ");
+ QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensorBackend::setDataRates with 0");
sensor.connectToBackend();
}
{
TestSensor sensor;
sensor.setProperty("doThis", "rates(nodef)");
- QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensorBackend::setDataRates with an invalid sensor ");
+ QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensorBackend::setDataRates with an invalid sensor");
sensor.connectToBackend();
}
@@ -417,10 +417,10 @@ private slots:
QList<QSensorFilter*> expected = QList<QSensorFilter*>();
QCOMPARE(actual, expected);
- QTest::ignoreMessage(QtWarningMsg, "addFilter: passed a null filter! ");
+ QTest::ignoreMessage(QtWarningMsg, "addFilter: passed a null filter!");
sensor.addFilter(0);
- QTest::ignoreMessage(QtWarningMsg, "removeFilter: passed a null filter! ");
+ QTest::ignoreMessage(QtWarningMsg, "removeFilter: passed a null filter!");
sensor.removeFilter(0);
MyFilter *filter = new MyFilter;
@@ -559,7 +559,7 @@ private slots:
sensor.setOutputRange(-1);
QCOMPARE(sensor.outputRange(), -1);
- QTest::ignoreMessage(QtWarningMsg, "setOutputRange: 300 is not supported by the sensor. ");
+ QTest::ignoreMessage(QtWarningMsg, "setOutputRange: 300 is not supported by the sensor.");
sensor.setOutputRange(300);
QCOMPARE(sensor.outputRange(), -1);
}
@@ -570,10 +570,10 @@ private slots:
sensor.setOutputRange(300);
QCOMPARE(sensor.outputRange(), 300);
sensor.setOutputRange(350);
- QTest::ignoreMessage(QtWarningMsg, "setOutputRange: 350 is not supported by the sensor. ");
+ QTest::ignoreMessage(QtWarningMsg, "setOutputRange: 350 is not supported by the sensor.");
sensor.connectToBackend();
QCOMPARE(sensor.outputRange(), -1);
- QTest::ignoreMessage(QtWarningMsg, "setOutputRange: -2 is not supported by the sensor. ");
+ QTest::ignoreMessage(QtWarningMsg, "setOutputRange: -2 is not supported by the sensor.");
sensor.setOutputRange(-2);
QCOMPARE(sensor.outputRange(), -1);
}
@@ -737,12 +737,12 @@ private slots:
QSensorManager::registerBackend("random", "random.2", &factory);
QSensor random("random");
// This is a sensorlog, not a warning
- //QTest::ignoreMessage(QtWarningMsg, "no suitable backend found for requested identifier \"\" and type \"random\" ");
+ //QTest::ignoreMessage(QtWarningMsg, "no suitable backend found for requested identifier \"\" and type \"random\"");
random.connectToBackend();
QVERIFY(!random.isConnectedToBackend());
random.setIdentifier("random.3");
// This is a sensorlog, not a warning
- //QTest::ignoreMessage(QtWarningMsg, "no backend with identifier \"random.3\" for type \"random\" ");
+ //QTest::ignoreMessage(QtWarningMsg, "no backend with identifier \"random.3\" for type \"random\"");
random.connectToBackend();
QVERIFY(!random.isConnectedToBackend());
random.setIdentifier("random.1");
@@ -764,7 +764,7 @@ private slots:
// Register it again (creates a warning)
sensor.sensorsChangedEmitted = 0;
- QTest::ignoreMessage(QtWarningMsg, "A backend with type \"a random type\" and identifier \"a random id\" has already been registered! ");
+ QTest::ignoreMessage(QtWarningMsg, "A backend with type \"a random type\" and identifier \"a random id\" has already been registered!");
QSensorManager::registerBackend("a random type", "a random id", &factory);
QCOMPARE(sensor.sensorsChangedEmitted, 0);
@@ -775,13 +775,13 @@ private slots:
// Unregister an unknown identifier
sensor.sensorsChangedEmitted = 0;
- QTest::ignoreMessage(QtWarningMsg, "Identifier \"a random id\" is not registered ");
+ QTest::ignoreMessage(QtWarningMsg, "Identifier \"a random id\" is not registered");
QSensorManager::unregisterBackend(TestSensor::type, "a random id");
QCOMPARE(sensor.sensorsChangedEmitted, 0);
// Unregister for an unknown type
sensor.sensorsChangedEmitted = 0;
- QTest::ignoreMessage(QtWarningMsg, "No backends of type \"foo\" are registered ");
+ QTest::ignoreMessage(QtWarningMsg, "No backends of type \"foo\" are registered");
QSensorManager::unregisterBackend("foo", "bar");
QCOMPARE(sensor.sensorsChangedEmitted, 0);
diff --git a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp
index da1d1f56..6aa6d47e 100644
--- a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp
+++ b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp
@@ -85,11 +85,11 @@ void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_shake()
QCOMPARE(recognizer->isActive(), false);
- QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized ");
+ QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized");
recognizer->startBackend();
QCOMPARE(recognizer->isActive(), false);
- QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized ");
+ QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized");
recognizer->stopBackend();
QCOMPARE(recognizer->isActive(), false);
diff --git a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp
index 86854293..0ca654a0 100644
--- a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp
+++ b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp
@@ -160,13 +160,13 @@ void Tst_qsensorgestureTest::tst_recognizer_dup()
{
QStringList idList;
{
-// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known. ");
+// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known.");
QSensorGestureManager manager;
idList = manager.gestureIds();
for (int i = 0; i < idList.count(); i++) {
if (idList.at(i) == "QtSensors.test.dup")
- QTest::ignoreMessage(QtWarningMsg, "Ignoring recognizer \"QtSensors.test.dup\" from plugin \"TestGesturesDup\" because it is already registered ");
+ QTest::ignoreMessage(QtWarningMsg, "Ignoring recognizer \"QtSensors.test.dup\" from plugin \"TestGesturesDup\" because it is already registered");
QStringList recognizerSignalsList = manager.recognizerSignals(idList.at(i));
QVERIFY(!recognizerSignalsList.contains("QtSensors.test2"));
@@ -253,7 +253,7 @@ void Tst_qsensorgestureTest::tst_manager_registerSensorGestureRecognizer()
QCOMPARE(num+1, manager.gestureIds().count());
recognizer = new QTest3Recognizer;
-// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors/test3\" is already known ");
+// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors/test3\" is already known");
ok = manager.registerSensorGestureRecognizer(recognizer);
QCOMPARE(ok, false);
QCOMPARE(num+1, manager.gestureIds().count());
@@ -280,7 +280,7 @@ void Tst_qsensorgestureTest::tst_manager__newSensorAvailable()
recognizer = new QTest3Recognizer;
recognizer->changeId("QtSensors.test4");
-// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test4\" is already known ");
+// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test4\" is already known");
ok = manager.registerSensorGestureRecognizer(recognizer);
QCOMPARE(ok, false);
QCOMPARE(spy_manager_available.count(),1);
@@ -605,15 +605,15 @@ void Tst_qsensorgestureTest::shakeDetected(const QString &type)
void Tst_qsensorgestureTest::tst_sensor_gesture_notinitialized()
{
- QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known. ");
+ QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known.");
QSensorGestureManager manager;
QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer("QtSensors.test");
- QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized ");
+ QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized");
recognizer->startBackend();
QVERIFY(recognizer->isActive() == false);
- QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized ");
+ QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized");
recognizer->stopBackend();
QVERIFY(recognizer->isActive() == false);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 23:06:48 +0000