diff options
author | alex <alex.blasche@nokia.com> | 2011-10-05 18:19:22 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-06 03:10:55 +0200 |
commit | 1843ebe4879e19dadcb1e55cb3d61909cac3ae63 (patch) | |
tree | bd47175a13e95b4974b192c9d60ff3d84f63de6e /tests | |
parent | 35467d40d3b655324c40f780d7de5c5594b8d0b8 (diff) | |
download | qtlocation-1843ebe4879e19dadcb1e55cb3d61909cac3ae63.tar.gz |
Cleanup project files of test case plug-ins
Change-Id: I7acd96b60748c6b441b4d4d60dc99d715623e49b
Reviewed-on: http://codereview.qt-project.org/6030
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'tests')
5 files changed, 5 insertions, 23 deletions
diff --git a/tests/auto/geotestplugin/geotestplugin.pro b/tests/auto/geotestplugin/geotestplugin.pro index 78ce5209..2e8af6fd 100644 --- a/tests/auto/geotestplugin/geotestplugin.pro +++ b/tests/auto/geotestplugin/geotestplugin.pro @@ -1,13 +1,8 @@ -load(qt_module) +load(qt_plugin) -TEMPLATE = lib -CONFIG += plugin testplugin TARGET = qtgeoservices_qmltestplugin -PLUGIN_TYPE=geoservices QT += location -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) -# TODO not sure where to put test plugins in Qt 5 DESTDIR = $$QT.location.plugins/geoservices HEADERS += qgeocodingmanagerengine_test.h \ @@ -17,9 +12,5 @@ HEADERS += qgeocodingmanagerengine_test.h \ SOURCES += qgeoserviceproviderplugin_test.cpp - -INCLUDEPATH += ../../../src/location \ - ../../../src/location/maps - target.path += $$[QT_INSTALL_PLUGINS]/geoservices INSTALLS += target diff --git a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp index f9e6c77b..9e583bc2 100644 --- a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp +++ b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.cpp @@ -188,5 +188,5 @@ void tst_QGeocodingManager::reverseGeocode() } -QTEST_MAIN(tst_QGeocodingManager) +QTEST_GUILESS_MAIN(tst_QGeocodingManager) diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro index 4b391346..3c41a645 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro +++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerplugins.pro @@ -1,13 +1,8 @@ -load(qt_module) +load(qt_plugin) -TEMPLATE = lib -CONFIG += plugin testplugin TARGET = qtgeoservices_geocodingplugin -PLUGIN_TYPE=geoservices QT += location -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) -# TODO not sure where to put test plugins in Qt 5 DESTDIR = $$QT.location.plugins/geoservices HEADERS += qgeocodingmanagerengine_test.h \ @@ -15,9 +10,5 @@ HEADERS += qgeocodingmanagerengine_test.h \ SOURCES += qgeoserviceproviderplugin_test.cpp - -INCLUDEPATH += ../../../src/location \ - ../../../src/location/maps - target.path += $$[QT_INSTALL_PLUGINS]/geoservices INSTALLS += target diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp index 91a6bbb7..484b76d1 100644 --- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp +++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp @@ -894,5 +894,5 @@ private slots: } }; -QTEST_MAIN(tst_QGeoCoordinate) +QTEST_GUILESS_MAIN(tst_QGeoCoordinate) #include "tst_qgeocoordinate.moc" diff --git a/tests/auto/qplacemanager/tst_qplacemanager.cpp b/tests/auto/qplacemanager/tst_qplacemanager.cpp index d9de1c28..60eb3301 100644 --- a/tests/auto/qplacemanager/tst_qplacemanager.cpp +++ b/tests/auto/qplacemanager/tst_qplacemanager.cpp @@ -96,6 +96,6 @@ void tst_QPlaceManager::cleanupTestCase() delete provider; } -QTEST_MAIN(tst_QPlaceManager) +QTEST_GUILESS_MAIN(tst_QPlaceManager) #include "tst_qplacemanager.moc" |