diff options
| -rw-r--r-- | config.tests/mtclient/main.cpp (renamed from config.tests/mtcore/main.cpp) | 3 | ||||
| -rw-r--r-- | config.tests/mtclient/mtclient.pro (renamed from config.tests/mtcore/mtcore.pro) | 3 | ||||
| -rw-r--r-- | src/location/location.pro | 4 | ||||
| -rw-r--r-- | src/location/qgeopositioninfosource_npe_backend_p.h | 2 | ||||
| -rw-r--r-- | src/location/qgeosatelliteinfosource_npe_backend_p.h | 2 | ||||
| -rw-r--r-- | sync.profile | 2 | ||||
| -rw-r--r-- | tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro | 2 |
7 files changed, 8 insertions, 10 deletions
diff --git a/config.tests/mtcore/main.cpp b/config.tests/mtclient/main.cpp index 29a05dac..fbb5887a 100644 --- a/config.tests/mtcore/main.cpp +++ b/config.tests/mtclient/main.cpp @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#include <mtcore/variantstream.h> - +#include <mt-client/variantstream.h> int main() { return 0; diff --git a/config.tests/mtcore/mtcore.pro b/config.tests/mtclient/mtclient.pro index c7e55138..2dc24936 100644 --- a/config.tests/mtcore/mtcore.pro +++ b/config.tests/mtclient/mtclient.pro @@ -1,9 +1,8 @@ TEMPLATE = app - QT += declarative unix{ CONFIG += link_pkgconfig - PKGCONFIG += mtcore + PKGCONFIG += mt-client } SOURCES += main.cpp diff --git a/src/location/location.pro b/src/location/location.pro index 625ca219..175aa31d 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -91,7 +91,7 @@ meego { } } -contains(config_test_jsondb, yes): contains(config_test_mtcore, yes) { +contains(config_test_jsondb, yes): contains(config_test_mtclient, yes) { DEFINES += NPE_BACKEND QT += jsondb-private SOURCES += qgeopositioninfosource_npe_backend.cpp\ @@ -101,7 +101,7 @@ contains(config_test_jsondb, yes): contains(config_test_mtcore, yes) { unix{ CONFIG += link_pkgconfig - PKGCONFIG += mtcore + PKGCONFIG += mt-client } } diff --git a/src/location/qgeopositioninfosource_npe_backend_p.h b/src/location/qgeopositioninfosource_npe_backend_p.h index 58086137..0f818908 100644 --- a/src/location/qgeopositioninfosource_npe_backend_p.h +++ b/src/location/qgeopositioninfosource_npe_backend_p.h @@ -54,7 +54,7 @@ // #include <qgeopositioninfosource.h> -#include <mtcore/variantstream.h> +#include <mt-client/variantstream.h> #include <private/jsondb-strings_p.h> #include <qlocalsocket.h> #include <qeventloop.h> diff --git a/src/location/qgeosatelliteinfosource_npe_backend_p.h b/src/location/qgeosatelliteinfosource_npe_backend_p.h index 94d084f4..8efcad17 100644 --- a/src/location/qgeosatelliteinfosource_npe_backend_p.h +++ b/src/location/qgeosatelliteinfosource_npe_backend_p.h @@ -55,7 +55,7 @@ #include "qgeosatelliteinfosource.h" #include "qgeosatelliteinfo.h" -#include <mtcore/variantstream.h> +#include <mt-client/variantstream.h> #include <private/jsondb-strings_p.h> #include <qlocalsocket.h> #include <qeventloop.h> diff --git a/sync.profile b/sync.profile index e5888d1f..fab19dbc 100644 --- a/sync.profile +++ b/sync.profile @@ -32,5 +32,5 @@ # compile tests %configtests = ( "jsondb" => {}, - "mtcore" => {}, + "mtclient" => {}, ); diff --git a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro index d4c87f43..658a5cfc 100644 --- a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro +++ b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro @@ -11,6 +11,6 @@ HEADERS += testqgeosatelliteinfosource_p.h \ QT += location testlib -contains(config_test_jsondb, yes): contains(config_test_mtcore, yes) { +contains(config_test_jsondb, yes): contains(config_test_mtclient, yes) { DEFINES += NPE_BACKEND } |