summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authoralex <alex.blasche@nokia.com>2011-10-17 15:16:31 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-17 08:46:14 +0200
commita3ee9bc23ead3ca88cb6787ca7add085d1d8ffcc (patch)
treebf58be33ffe5f7b18c4c20b0fec088913f7460a3 /tests
parent4cb9338c54fc68477c6597df2d36616951a3930d (diff)
downloadqtsensors-a3ee9bc23ead3ca88cb6787ca7add085d1d8ffcc.tar.gz
First step of removal of Q_SENSORS_EXPXORT macro from qglobal.h
Each module handles its own exports. We need to change the QtSensors version, remove the qglobal.h define and then add it back under the old name in QtSensors. Change-Id: I4183b7fcfc46469745c11c373d3122f02d64ccc7 Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qsensor/tst_qsensor.cpp2
-rw-r--r--tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp
index 3218d7f..0354314 100644
--- a/tests/auto/qsensor/tst_qsensor.cpp
+++ b/tests/auto/qsensor/tst_qsensor.cpp
@@ -56,7 +56,7 @@
// The unit test needs to change the behaviour of the library. It does this
// through an exported but undocumented function.
-Q_SENSORS_EXPORT void sensors_unit_test_hook(int index);
+Q_SENSORS_EXPORT_TEMP void sensors_unit_test_hook(int index);
bool operator==(const qoutputrange &orl1, const qoutputrange &orl2)
{
return (orl1.minimum == orl2.minimum &&
diff --git a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp
index 25419bc..3ba2ed4 100644
--- a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp
+++ b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp
@@ -53,7 +53,7 @@ QDeclAccelerometer* TestSensorPlugin::stAccel = 0;
QDeclAmbientLightSensor* TestSensorPlugin::stAbl = 0;
QDeclProximitySensor* TestSensorPlugin::stProxi = 0;
-Q_SENSORS_EXPORT void sensors_unit_test_hook(int index);
+Q_SENSORS_EXPORT_TEMP void sensors_unit_test_hook(int index);
class tst_Sensors2QMLAPI : public QObject
{