diff options
24 files changed, 34 insertions, 34 deletions
diff --git a/tests/auto/qgeocodereply/qgeocodereply.pro b/tests/auto/qgeocodereply/qgeocodereply.pro index a36435af..dea3d4c0 100644 --- a/tests/auto/qgeocodereply/qgeocodereply.pro +++ b/tests/auto/qgeocodereply/qgeocodereply.pro @@ -2,9 +2,9 @@ TEMPLATE = app CONFIG += testcase TARGET = tst_qgeocodereply -HEADERS += ../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../utils/qlocationtestutils_p.h \ tst_qgeocodereply.h SOURCES += tst_qgeocodereply.cpp \ - ../qgeocoordinate/qlocationtestutils.cpp + ../utils/qlocationtestutils.cpp QT += location testlib diff --git a/tests/auto/qgeocodereply/tst_qgeocodereply.h b/tests/auto/qgeocodereply/tst_qgeocodereply.h index d239362d..842d1b7b 100644 --- a/tests/auto/qgeocodereply/tst_qgeocodereply.h +++ b/tests/auto/qgeocodereply/tst_qgeocodereply.h @@ -48,7 +48,7 @@ #include <QMetaType> #include <QSignalSpy> -#include "../qgeocoordinate/qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" #include <qgeocodereply.h> #include <qgeolocation.h> diff --git a/tests/auto/qgeocodingmanager/qgeocodingmanager.pro b/tests/auto/qgeocodingmanager/qgeocodingmanager.pro index aaa9e078..aa37a8cc 100644 --- a/tests/auto/qgeocodingmanager/qgeocodingmanager.pro +++ b/tests/auto/qgeocodingmanager/qgeocodingmanager.pro @@ -1,10 +1,10 @@ CONFIG += testcase TARGET = tst_qgeocodingmanager -HEADERS += ../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../utils/qlocationtestutils_p.h \ tst_qgeocodingmanager.h SOURCES += tst_qgeocodingmanager.cpp \ - ../qgeocoordinate/qlocationtestutils.cpp + ../utils/qlocationtestutils.cpp QT += location testlib diff --git a/tests/auto/qgeocoordinate/qgeocoordinate.pro b/tests/auto/qgeocoordinate/qgeocoordinate.pro index 7287b119..a0f218e7 100644 --- a/tests/auto/qgeocoordinate/qgeocoordinate.pro +++ b/tests/auto/qgeocoordinate/qgeocoordinate.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qgeocoordinate -HEADERS += qlocationtestutils_p.h +HEADERS += ../utils/qlocationtestutils_p.h SOURCES += tst_qgeocoordinate.cpp \ - qlocationtestutils.cpp + ../utils/qlocationtestutils.cpp QT += location testlib diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp index f8df6b5f..f5e4e2ea 100644 --- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp +++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp @@ -41,7 +41,7 @@ //TESTED_COMPONENT=src/location -#include "qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" #include <qgeocoordinate.h> #include <qtest.h> diff --git a/tests/auto/qgeolocation/qgeolocation.pro b/tests/auto/qgeolocation/qgeolocation.pro index e80094ef..dc715c27 100644 --- a/tests/auto/qgeolocation/qgeolocation.pro +++ b/tests/auto/qgeolocation/qgeolocation.pro @@ -1,9 +1,9 @@ CONFIG += testcase TARGET = tst_qgeolocation -HEADERS += ../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../utils/qlocationtestutils_p.h \ tst_qgeolocation.h SOURCES += tst_qgeolocation.cpp \ - ../qgeocoordinate/qlocationtestutils.cpp + ../utils/qlocationtestutils.cpp QT += location testlib diff --git a/tests/auto/qgeolocation/tst_qgeolocation.h b/tests/auto/qgeolocation/tst_qgeolocation.h index 7f413842..3fb39ad3 100644 --- a/tests/auto/qgeolocation/tst_qgeolocation.h +++ b/tests/auto/qgeolocation/tst_qgeolocation.h @@ -47,7 +47,7 @@ #include <QtCore/QCoreApplication> #include <QMetaType> -#include "../qgeocoordinate/qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" #include <qgeoaddress.h> #include <qgeocoordinate.h> #include <qgeolocation.h> diff --git a/tests/auto/qgeomaneuver/qgeomaneuver.pro b/tests/auto/qgeomaneuver/qgeomaneuver.pro index 318b7511..670d0cd6 100644 --- a/tests/auto/qgeomaneuver/qgeomaneuver.pro +++ b/tests/auto/qgeomaneuver/qgeomaneuver.pro @@ -3,9 +3,9 @@ CONFIG+=testcase TARGET=tst_qgeomaneuver # Input -HEADERS += ../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../utils/qlocationtestutils_p.h \ tst_qgeomaneuver.h SOURCES += tst_qgeomaneuver.cpp \ - ../qgeocoordinate/qlocationtestutils.cpp + ../utils/qlocationtestutils.cpp QT += location testlib diff --git a/tests/auto/qgeomaneuver/tst_qgeomaneuver.h b/tests/auto/qgeomaneuver/tst_qgeomaneuver.h index a5067876..062b6902 100644 --- a/tests/auto/qgeomaneuver/tst_qgeomaneuver.h +++ b/tests/auto/qgeomaneuver/tst_qgeomaneuver.h @@ -49,7 +49,7 @@ #include <QMetaType> #include <QSignalSpy> -#include "../qgeocoordinate/qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" #include <qgeomaneuver.h> #include <qgeocoordinate.h> diff --git a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro index 9699b760..4ab28848 100644 --- a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro +++ b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro @@ -3,10 +3,10 @@ CONFIG+=testcase testcase.timeout = 400 # this test is slow TARGET=tst_qgeopositioninfosource -HEADERS += ../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../utils/qlocationtestutils_p.h \ testqgeopositioninfosource_p.h -SOURCES += ../qgeocoordinate/qlocationtestutils.cpp \ +SOURCES += ../utils/qlocationtestutils.cpp \ testqgeopositioninfosource.cpp \ tst_qgeopositioninfosource.cpp diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp index f5e3f9bf..bc463f99 100644 --- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp +++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp @@ -54,7 +54,7 @@ #include <qgeopositioninfo.h> #include "testqgeopositioninfosource_p.h" -#include "../qgeocoordinate/qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" Q_DECLARE_METATYPE(QGeoPositionInfoSource::PositioningMethod) Q_DECLARE_METATYPE(QGeoPositionInfoSource::PositioningMethods) diff --git a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro index 86d0f7db..ad2a0bdb 100644 --- a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro +++ b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro @@ -4,10 +4,10 @@ TARGET=tst_qgeosatelliteinfosource SOURCES += tst_qgeosatelliteinfosource.cpp \ testqgeosatelliteinfosource.cpp \ - ../qgeocoordinate/qlocationtestutils.cpp + ../utils/qlocationtestutils.cpp HEADERS += testqgeosatelliteinfosource_p.h \ - ../qgeocoordinate/qlocationtestutils_p.h + ../utils/qlocationtestutils_p.h QT += location testlib diff --git a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp index c6abf153..4845f91d 100644 --- a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp +++ b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp @@ -51,7 +51,7 @@ #include <qgeosatelliteinfo.h> #include "testqgeosatelliteinfosource_p.h" -#include "../qgeocoordinate/qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" Q_DECLARE_METATYPE(QList<QGeoSatelliteInfo>) diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro index ff57235d..26eee82a 100644 --- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro +++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro @@ -5,11 +5,11 @@ TARGET = tst_dummynmeapositioninfosource INCLUDEPATH += .. -HEADERS += ../../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../../utils/qlocationtestutils_p.h \ ../../qgeopositioninfosource/testqgeopositioninfosource_p.h \ ../qnmeapositioninfosourceproxyfactory.h -SOURCES += ../../qgeocoordinate/qlocationtestutils.cpp \ +SOURCES += ../../utils/qlocationtestutils.cpp \ ../../qgeopositioninfosource/testqgeopositioninfosource.cpp \ ../qnmeapositioninfosourceproxyfactory.cpp \ tst_dummynmeapositioninfosource.cpp diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp index 4c4251d5..94bf6070 100644 --- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp +++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp @@ -43,7 +43,7 @@ #include "qnmeapositioninfosourceproxyfactory.h" #include "../qgeopositioninfosource/testqgeopositioninfosource_p.h" -#include "../qgeocoordinate/qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" #include <qnmeapositioninfosource.h> #include <QSignalSpy> diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro index 5df263b3..e2d0a31d 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro @@ -5,12 +5,12 @@ TARGET = tst_qnmeapositioninfosource_realtime INCLUDEPATH += .. -HEADERS += ../../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../../utils/qlocationtestutils_p.h \ ../../qgeopositioninfosource/testqgeopositioninfosource_p.h \ ../qnmeapositioninfosourceproxyfactory.h \ ../tst_qnmeapositioninfosource.h -SOURCES += ../../qgeocoordinate/qlocationtestutils.cpp \ +SOURCES += ../../utils/qlocationtestutils.cpp \ ../../qgeopositioninfosource/testqgeopositioninfosource.cpp \ ../qnmeapositioninfosourceproxyfactory.cpp \ ../tst_qnmeapositioninfosource.cpp \ diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro index fe2583a4..8d20b922 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro @@ -6,12 +6,12 @@ TARGET = tst_qnmeapositioninfosource_realtime_generic INCLUDEPATH += .. -HEADERS += ../../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../../utils/qlocationtestutils_p.h \ ../../qgeopositioninfosource/testqgeopositioninfosource_p.h \ ../qnmeapositioninfosourceproxyfactory.h \ ../tst_qnmeapositioninfosource.h -SOURCES += ../../qgeocoordinate/qlocationtestutils.cpp \ +SOURCES += ../../utils/qlocationtestutils.cpp \ ../../qgeopositioninfosource/testqgeopositioninfosource.cpp \ ../qnmeapositioninfosourceproxyfactory.cpp \ ../tst_qnmeapositioninfosource.cpp \ diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro index 78cfd812..627997ed 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro @@ -5,12 +5,12 @@ TARGET = tst_qnmeapositioninfosource_simulation INCLUDEPATH += .. -HEADERS += ../../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../../utils/qlocationtestutils_p.h \ ../../qgeopositioninfosource/testqgeopositioninfosource_p.h \ ../qnmeapositioninfosourceproxyfactory.h \ ../tst_qnmeapositioninfosource.h -SOURCES += ../../qgeocoordinate/qlocationtestutils.cpp \ +SOURCES += ../../utils/qlocationtestutils.cpp \ ../../qgeopositioninfosource/testqgeopositioninfosource.cpp \ ../qnmeapositioninfosourceproxyfactory.cpp \ ../tst_qnmeapositioninfosource.cpp \ diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro index 72c44163..92895c9a 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro @@ -6,12 +6,12 @@ TARGET = tst_qnmeapositioninfosource_simulation_generic INCLUDEPATH += .. -HEADERS += ../../qgeocoordinate/qlocationtestutils_p.h \ +HEADERS += ../../utils/qlocationtestutils_p.h \ ../../qgeopositioninfosource/testqgeopositioninfosource_p.h \ ../qnmeapositioninfosourceproxyfactory.h \ ../tst_qnmeapositioninfosource.h -SOURCES += ../../qgeocoordinate/qlocationtestutils.cpp \ +SOURCES += ../../utils/qlocationtestutils.cpp \ ../../qgeopositioninfosource/testqgeopositioninfosource.cpp \ ../qnmeapositioninfosourceproxyfactory.cpp \ ../tst_qnmeapositioninfosource.cpp \ diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp index 2d5f6eef..a0f69f28 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qnmeapositioninfosourceproxyfactory.h" -#include "../qgeocoordinate/qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" #include <QIODevice> #include <QTcpServer> diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h index beaa55c6..5750bb07 100644 --- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h +++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h @@ -41,7 +41,7 @@ #include "qnmeapositioninfosourceproxyfactory.h" #include "../qgeopositioninfosource/testqgeopositioninfosource_p.h" -#include "../qgeocoordinate/qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" #include <qnmeapositioninfosource.h> diff --git a/tests/auto/qplaceresult/tst_qplaceresult.cpp b/tests/auto/qplaceresult/tst_qplaceresult.cpp index f54fef9b..24cd0825 100644 --- a/tests/auto/qplaceresult/tst_qplaceresult.cpp +++ b/tests/auto/qplaceresult/tst_qplaceresult.cpp @@ -44,7 +44,7 @@ #include <QtLocation/QPlaceIcon> #include <QtTest/QtTest> -#include "../qgeocoordinate/qlocationtestutils_p.h" +#include "../utils/qlocationtestutils_p.h" QT_USE_NAMESPACE diff --git a/tests/auto/qgeocoordinate/qlocationtestutils.cpp b/tests/auto/utils/qlocationtestutils.cpp index ec876567..ec876567 100644 --- a/tests/auto/qgeocoordinate/qlocationtestutils.cpp +++ b/tests/auto/utils/qlocationtestutils.cpp diff --git a/tests/auto/qgeocoordinate/qlocationtestutils_p.h b/tests/auto/utils/qlocationtestutils_p.h index c40441dd..c40441dd 100644 --- a/tests/auto/qgeocoordinate/qlocationtestutils_p.h +++ b/tests/auto/utils/qlocationtestutils_p.h |