summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsensor
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2012-03-14 15:59:49 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-16 08:02:10 +0100
commit1530ebcc019bf6c630e75ac3078586b70c6056e3 (patch)
tree4bb9cfc7f1be172dcc89b2c210434413debece57 /tests/auto/qsensor
parentafefdd5df374d8cfeca4614f4d25397fa6c997fe (diff)
Remove REGISTER_STATIC_PLUGIN
This API was never particularly reliable. It is somewhat incompatible with the new-style Qt plugins. Change-Id: Iaaa0e6282404ce5477abcc8b905b14b1fb58644c Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'tests/auto/qsensor')
-rw-r--r--tests/auto/qsensor/test_sensorplugin.cpp13
-rw-r--r--tests/auto/qsensor/tst_qsensor.cpp3
2 files changed, 0 insertions, 16 deletions
diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp
index 6633bf8c..08d6cd3e 100644
--- a/tests/auto/qsensor/test_sensorplugin.cpp
+++ b/tests/auto/qsensor/test_sensorplugin.cpp
@@ -120,17 +120,4 @@ public:
REGISTER_STATIC_PLUGIN_V2(TestSensorPlugin)
-class LegacySensorPlugin : public QSensorPluginInterface
-{
-public:
- void registerSensors()
- {
- qWarning() << "Loaded the LegacySensorPlugin";
- }
- QStringList keys() const { return QStringList() << "legacy";}
-
-};
-
-REGISTER_STATIC_PLUGIN(LegacySensorPlugin)
-
#include "test_sensorplugin.moc"
diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp
index 45b2ab3c..5a697ee3 100644
--- a/tests/auto/qsensor/tst_qsensor.cpp
+++ b/tests/auto/qsensor/tst_qsensor.cpp
@@ -140,9 +140,6 @@ private slots:
{
TestSensor sensor;
- // This confirms that legacy static plugins can still be registered
- QTest::ignoreMessage(QtWarningMsg, "Loaded the LegacySensorPlugin ");
-
// The logic for the test is in test_sensorplugin.cpp (which warns and aborts if the test fails)
(void)QSensor::sensorTypes();