diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-16 16:14:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-19 05:42:09 +0100 |
| commit | 3a2b8fcaa52af48f89ecb95a942aad8ecbfde83a (patch) | |
| tree | 9a89b0e1ed6b7ac94c16cd0f60422ef0d3fdb304 /tests/auto/qsensor/tst_qsensor.cpp | |
| parent | 53dc7cbe6e6a67132acfafb5230fe0fc897014cc (diff) | |
Use an environment variable to suppress loading of plugins.
This removes the last use of the sensors_unit_test_hook function
so it can be removed.
Change-Id: I9f0b27fc69bfe74a151826714e3a1c0e207a7e0c
Reviewed-by: Wolfgang Beck <wolfgang.beck@nokia.com>
Diffstat (limited to 'tests/auto/qsensor/tst_qsensor.cpp')
| -rw-r--r-- | tests/auto/qsensor/tst_qsensor.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp index 5a697ee3..92cb281a 100644 --- a/tests/auto/qsensor/tst_qsensor.cpp +++ b/tests/auto/qsensor/tst_qsensor.cpp @@ -117,7 +117,7 @@ class tst_QSensor : public QObject public: tst_QSensor() { - sensors_unit_test_hook(0); // change some flags the library uses + qputenv("QT_SENSORS_LOAD_PLUGINS", "0"); // Do not load plugins } private slots: @@ -924,17 +924,6 @@ private slots: sensor2.start(); QVERIFY(sensor2.isActive()); } - - // This test must be LAST or it will interfere with the other tests - void testLoadingPlugins() - { - // Go ahead and load the actual plugins (as a test that plugin loading works) - sensors_unit_test_hook(1); - - // Hmm... There's no real way to tell if this worked or not. - // If it doesn't work the unit test will probably crash. - // That's what it did on Symbian before plugin loading was fixed. - } }; QT_END_NAMESPACE |