From 1530ebcc019bf6c630e75ac3078586b70c6056e3 Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Wed, 14 Mar 2012 15:59:49 +1000 Subject: 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 --- tests/auto/qsensor/test_sensorplugin.cpp | 13 ------------- tests/auto/qsensor/tst_qsensor.cpp | 3 --- 2 files changed, 16 deletions(-) (limited to 'tests/auto/qsensor') 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(); -- cgit v1.2.3