diff --git a/QGCApplication.pro b/QGCApplication.pro index 012a15bf96449ada84ca6a83be23d07b8e1f6468..5a87bd60887e528baae858c70af73362a9b8c342 100644 --- a/QGCApplication.pro +++ b/QGCApplication.pro @@ -19,8 +19,9 @@ include(QGCCommon.pri) -TARGET = qgroundcontrol +TARGET = qgroundcontrol TEMPLATE = app +DESTDIR = $${OUT_PWD}/build # Load additional config flags from user_config.pri exists(user_config.pri):infile(user_config.pri, CONFIG) { @@ -34,13 +35,9 @@ LinuxBuild { # QGC QtLocation plugin -LIBS += -L$${LOCATION_PLUGIN_DESTDIR} -LIBS += -l$${LOCATION_PLUGIN_NAME} - -WindowsBuild { - PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}.lib -} else { - PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a +!ios { + LIBS += -L$${LOCATION_PLUGIN_DESTDIR} + LIBS += -l$${LOCATION_PLUGIN_NAME} } # Qt configuration @@ -88,8 +85,12 @@ MacBuild { iOSBuild { QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist - ICON = $${BASEDIR}/resources/icons/macx.icns - OTHER_FILES += $${BASEDIR}/iOS-Info.plist + OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist + ios_icon.files = $$files($$PWD/ios/AppIcon*.png) + QMAKE_BUNDLE_DATA += ios_icon + app_launch_images.files = $$PWD/ios/LaunchScreen.xib + QMAKE_BUNDLE_DATA += app_launch_images + #-- TODO: Add iTunesArtwork } LinuxBuild { @@ -278,7 +279,6 @@ WindowsBuild { HEADERS += src/stable_headers.h } - !iOSBuild { HEADERS += \ src/comm/SerialLink.h \ diff --git a/QGCCommon.pri b/QGCCommon.pri index f67098d4b0e1127e79b77333c65f0abf69f3a77c..d3638e8815702597ed6c24dee328477258375c47 100644 --- a/QGCCommon.pri +++ b/QGCCommon.pri @@ -30,10 +30,13 @@ linux { linux-g++ | linux-g++-64 { message("Linux build") CONFIG += LinuxBuild + DEFINES += __STDC_LIMIT_MACROS } else : android-g++ { message("Android build") CONFIG += AndroidBuild MobileBuild DEFINES += __android__ + DEFINES += __STDC_LIMIT_MACROS + target.path = $$DESTDIR warning("Android build is experimental and not fully functional") } else { error("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported") @@ -42,6 +45,7 @@ linux { win32-msvc2010 | win32-msvc2012 | win32-msvc2013 { message("Windows build") CONFIG += WindowsBuild + DEFINES += __STDC_LIMIT_MACROS } else { error("Unsupported Windows toolchain, only Visual Studio 2010, 2012, and 2013 are supported") } @@ -49,6 +53,10 @@ linux { macx-clang | macx-llvm { message("Mac build") CONFIG += MacBuild + CONFIG += x86_64 + CONFIG -= x86 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_MAC_SDK = macosx10.11 QMAKE_CXXFLAGS += -fvisibility=hidden } else { error("Unsupported Mac toolchain, only 64-bit LLVM+clang is supported") @@ -60,6 +68,9 @@ linux { message("iOS build") CONFIG += iOSBuild MobileBuild app_bundle DEFINES += __ios__ + QMAKE_IOS_DEPLOYMENT_TARGET = 8.0 + QMAKE_IOS_TARGETED_DEVICE_FAMILY = 2 #- iPad only for now + QMAKE_LFLAGS += -Wl,-no_pie warning("iOS build is experimental and not yet fully functional") } else { error("Unsupported build platform, only Linux, Windows, Android and Mac (Mac OS and iOS) are supported") @@ -109,76 +120,22 @@ win32:debug_and_release { # Setup our build directories BASEDIR = $$IN_PWD -DESTDIR = $${OUT_PWD}/debug -BUILDDIR = $${OUT_PWD}/build-debug -ReleaseBuild { - DESTDIR = $${OUT_PWD}/release - BUILDDIR = $${OUT_PWD}/build-release -} - -iOSBuild { - # For whatever reason, the iOS build fails with these set. Some files have the full, - # properly concatenaded path and file name while others have only the second portion, - # as if BUILDDIR was empty. - OBJECTS_DIR = $$(HOME)/tmp/qgcfoo - MOC_DIR = $$(HOME)/tmp/qgcfoo - UI_DIR = $$(HOME)/tmp/qgcfoo - RCC_DIR = $$(HOME)/tmp/qgcfoo -} else { - OBJECTS_DIR = $${BUILDDIR}/obj - MOC_DIR = $${BUILDDIR}/moc - UI_DIR = $${BUILDDIR}/ui - RCC_DIR = $${BUILDDIR}/rcc +!ios { + OBJECTS_DIR = $${OUT_PWD}/obj + MOC_DIR = $${OUT_PWD}/moc + UI_DIR = $${OUT_PWD}/ui + RCC_DIR = $${OUT_PWD}/rcc } LANGUAGE = C++ -AndroidBuild { - target.path = $$DESTDIR -} - -# We place the created plugin lib into the objects dir so that make clean will clean it as well -iOSBuild { - LOCATION_PLUGIN_DESTDIR = $$(HOME)/tmp/qgcfoo -} else { - LOCATION_PLUGIN_DESTDIR = $$OBJECTS_DIR -} - -LOCATION_PLUGIN_NAME = QGeoServiceProviderFactoryQGC - -message(BASEDIR $$BASEDIR DESTDIR $$DESTDIR TARGET $$TARGET OUTPUT $$OUT_PWD) +LOCATION_PLUGIN_DESTDIR = $${OUT_PWD}/src/QtLocationPlugin +LOCATION_PLUGIN_NAME = QGeoServiceProviderFactoryQGC # Turn off serial port warnings DEFINES += _TTY_NOWARN_ -# -# OS Specific settings -# - -AndroidBuild { - DEFINES += __STDC_LIMIT_MACROS -} - -iOSBuild { - QMAKE_IOS_DEPLOYMENT_TARGET = 7.0 -} - -MacBuild { - CONFIG += x86_64 - CONFIG -= x86 - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - QMAKE_MAC_SDK = macosx10.11 -} - -LinuxBuild { - DEFINES += __STDC_LIMIT_MACROS -} - -WindowsBuild { - DEFINES += __STDC_LIMIT_MACROS -} - # # By default warnings as errors are turned off. Even so, in order for a pull request # to be accepted you must compile cleanly with warnings as errors turned on the default diff --git a/QGCLocationPlugin.pro b/QGCLocationPlugin.pro deleted file mode 100644 index 740ff8590898f70a4db17367e9f1bfa6b65b469d..0000000000000000000000000000000000000000 --- a/QGCLocationPlugin.pro +++ /dev/null @@ -1,45 +0,0 @@ -include(QGCCommon.pri) - -TEMPLATE = lib -TARGET = QGeoServiceProviderFactoryQGC -CONFIG += plugin static -QT += location-private positioning-private network -PLUGIN_TYPE = geoservices - -DESTDIR = $${LOCATION_PLUGIN_DESTDIR} - -contains(QT_VERSION, 5.5.1) { - - message(Using Local QtLocation headers for Qt 5.5.1) - - INCLUDEPATH += \ - libs/qtlocation/include \ - -} else { - - message(Using Default QtLocation headers) - - INCLUDEPATH += $$QT.location.includes - -} - -HEADERS += \ - src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h \ - src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.h \ - src/QtLocationPlugin/qgeotilefetcherqgc.h \ - src/QtLocationPlugin/qgeomapreplyqgc.h \ - src/QtLocationPlugin/qgeocodingmanagerengineqgc.h \ - src/QtLocationPlugin/qgeocodereplyqgc.h \ - src/QtLocationPlugin/OpenPilotMaps.h - -SOURCES += \ - src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp \ - src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.cpp \ - src/QtLocationPlugin/qgeotilefetcherqgc.cpp \ - src/QtLocationPlugin/qgeomapreplyqgc.cpp \ - src/QtLocationPlugin/qgeocodingmanagerengineqgc.cpp \ - src/QtLocationPlugin/qgeocodereplyqgc.cpp \ - src/QtLocationPlugin/OpenPilotMaps.cc - -OTHER_FILES += \ - src/QtLocationPlugin/qgc_maps_plugin.json diff --git a/ios/AppIcon29x29.png b/ios/AppIcon29x29.png new file mode 100644 index 0000000000000000000000000000000000000000..22b02b2c44904b5a30990489a5d75aab9216c2d1 Binary files /dev/null and b/ios/AppIcon29x29.png differ diff --git a/ios/AppIcon29x29@2x.png b/ios/AppIcon29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..8bccfc00730d5b8d4564e6fb3c1989c326d25edc Binary files /dev/null and b/ios/AppIcon29x29@2x.png differ diff --git a/ios/AppIcon29x29@2x~ipad.png b/ios/AppIcon29x29@2x~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..7d993b049638973dd874d0c6d72884a6eef23caf Binary files /dev/null and b/ios/AppIcon29x29@2x~ipad.png differ diff --git a/ios/AppIcon29x29~ipad.png b/ios/AppIcon29x29~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..9f4d3566bbe997b5745753575c2fde6a69df9179 Binary files /dev/null and b/ios/AppIcon29x29~ipad.png differ diff --git a/ios/AppIcon40x40@2x.png b/ios/AppIcon40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..85b0f543d39c7943ae61eda226dc402dcbb28891 Binary files /dev/null and b/ios/AppIcon40x40@2x.png differ diff --git a/ios/AppIcon40x40@2x~ipad.png b/ios/AppIcon40x40@2x~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..b38d96a20bec772bb05e2839dc0c1d8b47f4ae20 Binary files /dev/null and b/ios/AppIcon40x40@2x~ipad.png differ diff --git a/ios/AppIcon40x40~ipad.png b/ios/AppIcon40x40~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..ed4de9e8e5835dd2c925a5da3ef80b4ed3753cb7 Binary files /dev/null and b/ios/AppIcon40x40~ipad.png differ diff --git a/ios/AppIcon50x50@2x~ipad.png b/ios/AppIcon50x50@2x~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..c11f619763e9ce460c0a6376c3a2aeb091fb9a02 Binary files /dev/null and b/ios/AppIcon50x50@2x~ipad.png differ diff --git a/ios/AppIcon50x50~ipad.png b/ios/AppIcon50x50~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..cd3b929a54d1e702eb2f198a538b40011eb5f4ee Binary files /dev/null and b/ios/AppIcon50x50~ipad.png differ diff --git a/ios/AppIcon57x57.png b/ios/AppIcon57x57.png new file mode 100644 index 0000000000000000000000000000000000000000..73db1a53429872e097bb82df2d06b727f619c84d Binary files /dev/null and b/ios/AppIcon57x57.png differ diff --git a/ios/AppIcon57x57@2x.png b/ios/AppIcon57x57@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..17cfb33ab553c7ac7e121997990b0a653df45bfa Binary files /dev/null and b/ios/AppIcon57x57@2x.png differ diff --git a/ios/AppIcon60x60@2x.png b/ios/AppIcon60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5fee5f54efcc9757b1953d94b6ec0aab9feaba4c Binary files /dev/null and b/ios/AppIcon60x60@2x.png differ diff --git a/ios/AppIcon72x72@2x~ipad.png b/ios/AppIcon72x72@2x~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..3701cc606c08c784b8f614a091b412606ce09229 Binary files /dev/null and b/ios/AppIcon72x72@2x~ipad.png differ diff --git a/ios/AppIcon72x72~ipad.png b/ios/AppIcon72x72~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..4269185b4db028c6493de3c72e1ac261cb27eb44 Binary files /dev/null and b/ios/AppIcon72x72~ipad.png differ diff --git a/ios/AppIcon76x76@2x~ipad.png b/ios/AppIcon76x76@2x~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..1edf9c464817d099746594c4715850a361fc298c Binary files /dev/null and b/ios/AppIcon76x76@2x~ipad.png differ diff --git a/ios/AppIcon76x76~ipad.png b/ios/AppIcon76x76~ipad.png new file mode 100644 index 0000000000000000000000000000000000000000..a5651fe9d823d36b7732ff79e714681af4dae4d9 Binary files /dev/null and b/ios/AppIcon76x76~ipad.png differ diff --git a/ios/LaunchScreen.xib b/ios/LaunchScreen.xib new file mode 100644 index 0000000000000000000000000000000000000000..326beab387ed50550086e193f5a4a82b0c14e7c3 --- /dev/null +++ b/ios/LaunchScreen.xib @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/iOS-Info.plist b/ios/iOS-Info.plist index 977556aa2889bb23e42c64368068d3b3d18958ca..884b7b5b5f26a4984d8b5fec939a371cd87fce14 100644 --- a/ios/iOS-Info.plist +++ b/ios/iOS-Info.plist @@ -2,36 +2,82 @@ - CFBundleIconFile - - CFBundlePackageType - APPL - CFBundleGetInfoString - Created by Qt/QMake - CFBundleSignature - ???? - CFBundleExecutable + CFBundleDisplayName + QGroundControl + CFBundleExecutable qgroundcontrol - CFBundleIdentifier - org.qgroundcontrol.${PRODUCT_NAME:rfc1034identifier} - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleName - ${PRODUCT_NAME} - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1.0 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UISupportedInterfaceOrientations - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - NOTE - This file was generated by Qt/QMake. + CFBundleGetInfoString + Created by Qt/QMake + CFBundleIconFile + + CFBundleIdentifier + com.grubba.qgroundcontrol + CFBundleName + QGroundControl + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + NOTE + This file was generated by Qt/QMake. + UILaunchStoryboardName + LaunchScreen.xib + UIRequiresFullScreen + + CFBundleInfoDictionaryVersion + 6.0 + ForAppStore + Yes + UISupportedInterfaceOrientations + + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + AppIcon29x29.png + AppIcon29x29@2x.png + AppIcon40x40@2x.png + AppIcon57x57.png + AppIcon57x57@2x.png + AppIcon60x60@2x.png + + + + CFBundleIcons~ipad + + CFBundlePrimaryIcon + + CFBundleIconFiles + + AppIcon29x29.png + AppIcon29x29@2x.png + AppIcon40x40@2x.png + AppIcon57x57.png + AppIcon57x57@2x.png + AppIcon60x60@2x.png + AppIcon29x29~ipad.png + AppIcon29x29@2x~ipad.png + AppIcon40x40~ipad.png + AppIcon40x40@2x~ipad.png + AppIcon50x50~ipad.png + AppIcon50x50@2x~ipad.png + AppIcon72x72~ipad.png + AppIcon72x72@2x~ipad.png + AppIcon76x76~ipad.png + AppIcon76x76@2x~ipad.png + + + diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 6928aadf96b2ef13c0e8365a3b6c38315f2aa07e..259878f7e12e12e26fde335802ac6901f9ef8e5e 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -17,12 +17,9 @@ # along with QGroundControl. If not, see . # ------------------------------------------------- -TEMPLATE = subdirs -CONFIG += ordered -SUBDIRS = ./QGCLocationPlugin.pro -SUBDIRS += ./QGCApplication.pro - -QGCApplication.depends = QGCLocationPlugin +equals(OUT_PWD, $$IN_PWD) { + error("You must use shadow build.") +} message(Qt version $$[QT_VERSION]) @@ -30,3 +27,12 @@ message(Qt version $$[QT_VERSION]) error("Unsupported Qt version, 5.4+ is required") } +ios { + include($$PWD/src/QtLocationPlugin/QGCLocationPlugin.pro) + include($$PWD/QGCApplication.pro) +} else { + TEMPLATE = subdirs + SUBDIRS = ./src/QtLocationPlugin/QGCLocationPlugin.pro + SUBDIRS += ./QGCApplication.pro + QGCApplication.depends = QGCLocationPlugin +} diff --git a/src/QtLocationPlugin/QGCLocationPlugin.pro b/src/QtLocationPlugin/QGCLocationPlugin.pro new file mode 100644 index 0000000000000000000000000000000000000000..f7d617d0ab17be0f323aa65e33f0f8cab0dfea64 --- /dev/null +++ b/src/QtLocationPlugin/QGCLocationPlugin.pro @@ -0,0 +1,46 @@ + +!ios { + include($$PWD/../../QGCCommon.pri) + TEMPLATE = lib + TARGET = QGeoServiceProviderFactoryQGC + CONFIG += plugin static + PLUGIN_TYPE = geoservices +} + +QT += location-private positioning-private network + +contains(QT_VERSION, 5.5.1) { + + message(Using Local QtLocation headers for Qt 5.5.1) + + INCLUDEPATH += \ + $$PWD/qtlocation/include \ + +} else { + + message(Using Default QtLocation headers) + + INCLUDEPATH += $$QT.location.includes + +} + +HEADERS += \ + $$PWD/qgeoserviceproviderpluginqgc.h \ + $$PWD/qgeotiledmappingmanagerengineqgc.h \ + $$PWD/qgeotilefetcherqgc.h \ + $$PWD/qgeomapreplyqgc.h \ + $$PWD/qgeocodingmanagerengineqgc.h \ + $$PWD/qgeocodereplyqgc.h \ + $$PWD/OpenPilotMaps.h + +SOURCES += \ + $$PWD/qgeoserviceproviderpluginqgc.cpp \ + $$PWD/qgeotiledmappingmanagerengineqgc.cpp \ + $$PWD/qgeotilefetcherqgc.cpp \ + $$PWD/qgeomapreplyqgc.cpp \ + $$PWD/qgeocodingmanagerengineqgc.cpp \ + $$PWD/qgeocodereplyqgc.cpp \ + $$PWD/OpenPilotMaps.cc + +OTHER_FILES += \ + $$PWD/qgc_maps_plugin.json diff --git a/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp b/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp index 446ea2f9aaaeac44232806d14a6c867c07ee80c3..c47c846de366fdf19a608eb46a4f11ad01e42bb0 100644 --- a/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp +++ b/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp @@ -51,6 +51,16 @@ #include "qgeotiledmappingmanagerengineqgc.h" #include "qgeocodingmanagerengineqgc.h" +#if defined (__ios__) +Q_EXTERN_C Q_DECL_EXPORT const char *qt_plugin_query_metadata(); +Q_EXTERN_C Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance(); +const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_QGeoServiceProviderFactoryQGC() +{ + QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance, qt_plugin_query_metadata}; + return plugin; +} +#endif + QGeoCodingManagerEngine *QGeoServiceProviderFactoryQGC::createGeocodingManagerEngine( const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { diff --git a/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h b/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h index a4d86e8fe23270bf887023af16593a49de178701..49f598b2376a4d13c47fb432a3aca613dead44f1 100644 --- a/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h +++ b/src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h @@ -58,10 +58,10 @@ class QGeoServiceProviderFactoryQGC: public QObject, public QGeoServiceProviderF Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" FILE "qgc_maps_plugin.json") public: - QGeoCodingManagerEngine* createGeocodingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; - QGeoMappingManagerEngine* createMappingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; - QGeoRoutingManagerEngine* createRoutingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; - QPlaceManagerEngine* createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; + QGeoCodingManagerEngine* createGeocodingManagerEngine (const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; + QGeoMappingManagerEngine* createMappingManagerEngine (const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; + QGeoRoutingManagerEngine* createRoutingManagerEngine (const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; + QPlaceManagerEngine* createPlaceManagerEngine (const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; }; #endif // QGEOSERVICEPROVIDER_GOOGLE_H diff --git a/src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.cpp b/src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.cpp index 1422f55552068cf90a34cdf80757963acdb1b42f..37d359d2c35d4fb2b63616736973bb8c7c56adef 100644 --- a/src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.cpp +++ b/src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.cpp @@ -58,7 +58,6 @@ #include "qgeotilefetcherqgc.h" #include "OpenPilotMaps.h" - #if QT_VERSION >= 0x050500 QGeoTiledMapQGC::QGeoTiledMapQGC(QGeoTiledMappingManagerEngine *engine, QObject *parent) : QGeoTiledMap(engine, parent) diff --git a/libs/qtlocation/README.md b/src/QtLocationPlugin/qtlocation/README.md similarity index 100% rename from libs/qtlocation/README.md rename to src/QtLocationPlugin/qtlocation/README.md diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qcache3q_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qcache3q_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qcache3q_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qcache3q_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameracapabilities_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameracapabilities_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameracapabilities_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameracapabilities_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameradata_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameradata_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameradata_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameradata_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameratiles_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameratiles_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameratiles_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocameratiles_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodereply_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodereply_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodereply_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodereply_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodingmanager_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodingmanager_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodingmanager_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodingmanager_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodingmanagerengine_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodingmanagerengine_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodingmanagerengine_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeocodingmanagerengine_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaneuver_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaneuver_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaneuver_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaneuver_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomap_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomap_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomap_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomap_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomap_p_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomap_p_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomap_p_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomap_p_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomapcontroller_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomapcontroller_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomapcontroller_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomapcontroller_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanager_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanager_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanager_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanager_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanager_p_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanager_p_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanager_p_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanager_p_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanagerengine_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanagerengine_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanagerengine_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanagerengine_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanagerengine_p_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanagerengine_p_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanagerengine_p_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomappingmanagerengine_p_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomapscene_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomapscene_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomapscene_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomapscene_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaptype_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaptype_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaptype_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaptype_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaptype_p_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaptype_p_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaptype_p_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeomaptype_p_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroute_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroute_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroute_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroute_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutereply_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutereply_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutereply_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutereply_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeorouterequest_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeorouterequest_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeorouterequest_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeorouterequest_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutesegment_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutesegment_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutesegment_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutesegment_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutingmanager_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutingmanager_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutingmanager_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutingmanager_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutingmanagerengine_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutingmanagerengine_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutingmanagerengine_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoroutingmanagerengine_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoserviceprovider_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoserviceprovider_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoserviceprovider_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeoserviceprovider_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilecache_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilecache_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilecache_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilecache_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmap_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmap_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmap_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmap_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmap_p_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmap_p_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmap_p_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmap_p_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmappingmanagerengine_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmappingmanagerengine_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmappingmanagerengine_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmappingmanagerengine_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmapreply_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmapreply_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmapreply_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmapreply_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmapreply_p_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmapreply_p_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmapreply_p_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotiledmapreply_p_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilefetcher_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilefetcher_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilefetcher_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilefetcher_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilefetcher_p_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilefetcher_p_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilefetcher_p_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilefetcher_p_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilerequestmanager_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilerequestmanager_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilerequestmanager_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilerequestmanager_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilespec_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilespec_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilespec_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilespec_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilespec_p_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilespec_p_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilespec_p_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qgeotilespec_p_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplace_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplace_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplace_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplace_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceattribute_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceattribute_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceattribute_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceattribute_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecategory_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecategory_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecategory_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecategory_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontactdetail_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontactdetail_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontactdetail_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontactdetail_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontent_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontent_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontent_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontent_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontentrequest_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontentrequest_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontentrequest_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacecontentrequest_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceeditorial_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceeditorial_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceeditorial_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceeditorial_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceicon_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceicon_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceicon_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceicon_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceimage_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceimage_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceimage_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceimage_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacemanagerengine_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacemanagerengine_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacemanagerengine_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacemanagerengine_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceproposedsearchresult_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceproposedsearchresult_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceproposedsearchresult_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceproposedsearchresult_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceratings_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceratings_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceratings_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceratings_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacereply_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacereply_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacereply_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacereply_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceresult_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceresult_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceresult_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceresult_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacereview_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacereview_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacereview_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacereview_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacesearchresult_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacesearchresult_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacesearchresult_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacesearchresult_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacesupplier_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacesupplier_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacesupplier_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplacesupplier_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceuser_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceuser_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceuser_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/qplaceuser_p.h diff --git a/libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/unsupportedreplies_p.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/unsupportedreplies_p.h similarity index 100% rename from libs/qtlocation/include/QtLocation/5.5.1/QtLocation/private/unsupportedreplies_p.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/5.5.1/QtLocation/private/unsupportedreplies_p.h diff --git a/libs/qtlocation/include/QtLocation/QGeoCodeReply b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoCodeReply similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoCodeReply rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoCodeReply diff --git a/libs/qtlocation/include/QtLocation/QGeoCodingManager b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoCodingManager similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoCodingManager rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoCodingManager diff --git a/libs/qtlocation/include/QtLocation/QGeoCodingManagerEngine b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoCodingManagerEngine similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoCodingManagerEngine rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoCodingManagerEngine diff --git a/libs/qtlocation/include/QtLocation/QGeoManeuver b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoManeuver similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoManeuver rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoManeuver diff --git a/libs/qtlocation/include/QtLocation/QGeoRoute b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRoute similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoRoute rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRoute diff --git a/libs/qtlocation/include/QtLocation/QGeoRouteReply b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRouteReply similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoRouteReply rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRouteReply diff --git a/libs/qtlocation/include/QtLocation/QGeoRouteRequest b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRouteRequest similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoRouteRequest rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRouteRequest diff --git a/libs/qtlocation/include/QtLocation/QGeoRouteSegment b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRouteSegment similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoRouteSegment rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRouteSegment diff --git a/libs/qtlocation/include/QtLocation/QGeoRoutingManager b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRoutingManager similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoRoutingManager rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRoutingManager diff --git a/libs/qtlocation/include/QtLocation/QGeoRoutingManagerEngine b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRoutingManagerEngine similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoRoutingManagerEngine rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoRoutingManagerEngine diff --git a/libs/qtlocation/include/QtLocation/QGeoServiceProvider b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoServiceProvider similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoServiceProvider rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoServiceProvider diff --git a/libs/qtlocation/include/QtLocation/QGeoServiceProviderFactory b/src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoServiceProviderFactory similarity index 100% rename from libs/qtlocation/include/QtLocation/QGeoServiceProviderFactory rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QGeoServiceProviderFactory diff --git a/libs/qtlocation/include/QtLocation/QLocation b/src/QtLocationPlugin/qtlocation/include/QtLocation/QLocation similarity index 100% rename from libs/qtlocation/include/QtLocation/QLocation rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QLocation diff --git a/libs/qtlocation/include/QtLocation/QPlace b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlace similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlace rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlace diff --git a/libs/qtlocation/include/QtLocation/QPlaceAttribute b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceAttribute similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceAttribute rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceAttribute diff --git a/libs/qtlocation/include/QtLocation/QPlaceCategory b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceCategory similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceCategory rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceCategory diff --git a/libs/qtlocation/include/QtLocation/QPlaceContactDetail b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceContactDetail similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceContactDetail rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceContactDetail diff --git a/libs/qtlocation/include/QtLocation/QPlaceContent b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceContent similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceContent rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceContent diff --git a/libs/qtlocation/include/QtLocation/QPlaceContentReply b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceContentReply similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceContentReply rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceContentReply diff --git a/libs/qtlocation/include/QtLocation/QPlaceContentRequest b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceContentRequest similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceContentRequest rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceContentRequest diff --git a/libs/qtlocation/include/QtLocation/QPlaceDetailsReply b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceDetailsReply similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceDetailsReply rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceDetailsReply diff --git a/libs/qtlocation/include/QtLocation/QPlaceEditorial b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceEditorial similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceEditorial rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceEditorial diff --git a/libs/qtlocation/include/QtLocation/QPlaceIcon b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceIcon similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceIcon rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceIcon diff --git a/libs/qtlocation/include/QtLocation/QPlaceIdReply b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceIdReply similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceIdReply rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceIdReply diff --git a/libs/qtlocation/include/QtLocation/QPlaceImage b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceImage similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceImage rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceImage diff --git a/libs/qtlocation/include/QtLocation/QPlaceManager b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceManager similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceManager rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceManager diff --git a/libs/qtlocation/include/QtLocation/QPlaceManagerEngine b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceManagerEngine similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceManagerEngine rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceManagerEngine diff --git a/libs/qtlocation/include/QtLocation/QPlaceMatchReply b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceMatchReply similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceMatchReply rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceMatchReply diff --git a/libs/qtlocation/include/QtLocation/QPlaceMatchRequest b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceMatchRequest similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceMatchRequest rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceMatchRequest diff --git a/libs/qtlocation/include/QtLocation/QPlaceProposedSearchResult b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceProposedSearchResult similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceProposedSearchResult rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceProposedSearchResult diff --git a/libs/qtlocation/include/QtLocation/QPlaceRatings b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceRatings similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceRatings rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceRatings diff --git a/libs/qtlocation/include/QtLocation/QPlaceReply b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceReply similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceReply rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceReply diff --git a/libs/qtlocation/include/QtLocation/QPlaceResult b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceResult similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceResult rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceResult diff --git a/libs/qtlocation/include/QtLocation/QPlaceReview b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceReview similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceReview rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceReview diff --git a/libs/qtlocation/include/QtLocation/QPlaceSearchReply b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSearchReply similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceSearchReply rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSearchReply diff --git a/libs/qtlocation/include/QtLocation/QPlaceSearchRequest b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSearchRequest similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceSearchRequest rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSearchRequest diff --git a/libs/qtlocation/include/QtLocation/QPlaceSearchResult b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSearchResult similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceSearchResult rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSearchResult diff --git a/libs/qtlocation/include/QtLocation/QPlaceSearchSuggestionReply b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSearchSuggestionReply similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceSearchSuggestionReply rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSearchSuggestionReply diff --git a/libs/qtlocation/include/QtLocation/QPlaceSupplier b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSupplier similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceSupplier rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceSupplier diff --git a/libs/qtlocation/include/QtLocation/QPlaceUser b/src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceUser similarity index 100% rename from libs/qtlocation/include/QtLocation/QPlaceUser rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QPlaceUser diff --git a/libs/qtlocation/include/QtLocation/QtLocation b/src/QtLocationPlugin/qtlocation/include/QtLocation/QtLocation similarity index 100% rename from libs/qtlocation/include/QtLocation/QtLocation rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QtLocation diff --git a/libs/qtlocation/include/QtLocation/QtLocationVersion b/src/QtLocationPlugin/qtlocation/include/QtLocation/QtLocationVersion similarity index 100% rename from libs/qtlocation/include/QtLocation/QtLocationVersion rename to src/QtLocationPlugin/qtlocation/include/QtLocation/QtLocationVersion diff --git a/libs/qtlocation/include/QtLocation/placemacro.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/placemacro.h similarity index 100% rename from libs/qtlocation/include/QtLocation/placemacro.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/placemacro.h diff --git a/libs/qtlocation/include/QtLocation/qgeocodereply.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeocodereply.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeocodereply.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeocodereply.h diff --git a/libs/qtlocation/include/QtLocation/qgeocodingmanager.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeocodingmanager.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeocodingmanager.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeocodingmanager.h diff --git a/libs/qtlocation/include/QtLocation/qgeocodingmanagerengine.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeocodingmanagerengine.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeocodingmanagerengine.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeocodingmanagerengine.h diff --git a/libs/qtlocation/include/QtLocation/qgeomaneuver.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeomaneuver.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeomaneuver.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeomaneuver.h diff --git a/libs/qtlocation/include/QtLocation/qgeoroute.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroute.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeoroute.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroute.h diff --git a/libs/qtlocation/include/QtLocation/qgeoroutereply.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroutereply.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeoroutereply.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroutereply.h diff --git a/libs/qtlocation/include/QtLocation/qgeorouterequest.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeorouterequest.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeorouterequest.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeorouterequest.h diff --git a/libs/qtlocation/include/QtLocation/qgeoroutesegment.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroutesegment.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeoroutesegment.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroutesegment.h diff --git a/libs/qtlocation/include/QtLocation/qgeoroutingmanager.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroutingmanager.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeoroutingmanager.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroutingmanager.h diff --git a/libs/qtlocation/include/QtLocation/qgeoroutingmanagerengine.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroutingmanagerengine.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeoroutingmanagerengine.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoroutingmanagerengine.h diff --git a/libs/qtlocation/include/QtLocation/qgeoserviceprovider.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoserviceprovider.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeoserviceprovider.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoserviceprovider.h diff --git a/libs/qtlocation/include/QtLocation/qgeoserviceproviderfactory.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoserviceproviderfactory.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qgeoserviceproviderfactory.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qgeoserviceproviderfactory.h diff --git a/libs/qtlocation/include/QtLocation/qlocation.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qlocation.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qlocation.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qlocation.h diff --git a/libs/qtlocation/include/QtLocation/qlocationglobal.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qlocationglobal.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qlocationglobal.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qlocationglobal.h diff --git a/libs/qtlocation/include/QtLocation/qplace.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplace.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplace.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplace.h diff --git a/libs/qtlocation/include/QtLocation/qplaceattribute.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceattribute.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplaceattribute.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceattribute.h diff --git a/libs/qtlocation/include/QtLocation/qplacecategory.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecategory.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacecategory.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecategory.h diff --git a/libs/qtlocation/include/QtLocation/qplacecontactdetail.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecontactdetail.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacecontactdetail.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecontactdetail.h diff --git a/libs/qtlocation/include/QtLocation/qplacecontent.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecontent.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacecontent.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecontent.h diff --git a/libs/qtlocation/include/QtLocation/qplacecontentreply.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecontentreply.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacecontentreply.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecontentreply.h diff --git a/libs/qtlocation/include/QtLocation/qplacecontentrequest.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecontentrequest.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacecontentrequest.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacecontentrequest.h diff --git a/libs/qtlocation/include/QtLocation/qplacedetailsreply.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacedetailsreply.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacedetailsreply.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacedetailsreply.h diff --git a/libs/qtlocation/include/QtLocation/qplaceeditorial.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceeditorial.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplaceeditorial.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceeditorial.h diff --git a/libs/qtlocation/include/QtLocation/qplaceicon.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceicon.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplaceicon.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceicon.h diff --git a/libs/qtlocation/include/QtLocation/qplaceidreply.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceidreply.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplaceidreply.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceidreply.h diff --git a/libs/qtlocation/include/QtLocation/qplaceimage.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceimage.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplaceimage.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceimage.h diff --git a/libs/qtlocation/include/QtLocation/qplacemanager.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacemanager.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacemanager.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacemanager.h diff --git a/libs/qtlocation/include/QtLocation/qplacemanagerengine.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacemanagerengine.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacemanagerengine.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacemanagerengine.h diff --git a/libs/qtlocation/include/QtLocation/qplacematchreply.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacematchreply.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacematchreply.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacematchreply.h diff --git a/libs/qtlocation/include/QtLocation/qplacematchrequest.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacematchrequest.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacematchrequest.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacematchrequest.h diff --git a/libs/qtlocation/include/QtLocation/qplaceproposedsearchresult.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceproposedsearchresult.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplaceproposedsearchresult.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceproposedsearchresult.h diff --git a/libs/qtlocation/include/QtLocation/qplaceratings.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceratings.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplaceratings.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceratings.h diff --git a/libs/qtlocation/include/QtLocation/qplacereply.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacereply.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacereply.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacereply.h diff --git a/libs/qtlocation/include/QtLocation/qplaceresult.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceresult.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplaceresult.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceresult.h diff --git a/libs/qtlocation/include/QtLocation/qplacereview.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacereview.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacereview.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacereview.h diff --git a/libs/qtlocation/include/QtLocation/qplacesearchreply.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesearchreply.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacesearchreply.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesearchreply.h diff --git a/libs/qtlocation/include/QtLocation/qplacesearchrequest.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesearchrequest.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacesearchrequest.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesearchrequest.h diff --git a/libs/qtlocation/include/QtLocation/qplacesearchresult.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesearchresult.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacesearchresult.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesearchresult.h diff --git a/libs/qtlocation/include/QtLocation/qplacesearchsuggestionreply.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesearchsuggestionreply.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacesearchsuggestionreply.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesearchsuggestionreply.h diff --git a/libs/qtlocation/include/QtLocation/qplacesupplier.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesupplier.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplacesupplier.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplacesupplier.h diff --git a/libs/qtlocation/include/QtLocation/qplaceuser.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceuser.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qplaceuser.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qplaceuser.h diff --git a/libs/qtlocation/include/QtLocation/qtlocationversion.h b/src/QtLocationPlugin/qtlocation/include/QtLocation/qtlocationversion.h similarity index 100% rename from libs/qtlocation/include/QtLocation/qtlocationversion.h rename to src/QtLocationPlugin/qtlocation/include/QtLocation/qtlocationversion.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdeclarativegeoaddress_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdeclarativegeoaddress_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdeclarativegeoaddress_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdeclarativegeoaddress_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdeclarativegeolocation_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdeclarativegeolocation_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdeclarativegeolocation_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdeclarativegeolocation_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdoublevector2d_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdoublevector2d_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdoublevector2d_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdoublevector2d_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdoublevector3d_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdoublevector3d_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdoublevector3d_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qdoublevector3d_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoaddress_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoaddress_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoaddress_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoaddress_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeocircle_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeocircle_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeocircle_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeocircle_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeocoordinate_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeocoordinate_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeocoordinate_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeocoordinate_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeolocation_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeolocation_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeolocation_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeolocation_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeopositioninfosource_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeopositioninfosource_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeopositioninfosource_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeopositioninfosource_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoprojection_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoprojection_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoprojection_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoprojection_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeorectangle_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeorectangle_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeorectangle_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeorectangle_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoshape_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoshape_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoshape_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qgeoshape_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qlocationutils_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qlocationutils_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qlocationutils_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qlocationutils_p.h diff --git a/libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qnmeapositioninfosource_p.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qnmeapositioninfosource_p.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qnmeapositioninfosource_p.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/5.5.1/QtPositioning/private/qnmeapositioninfosource_p.h diff --git a/libs/qtlocation/include/QtPositioning/QGeoAddress b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoAddress similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoAddress rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoAddress diff --git a/libs/qtlocation/include/QtPositioning/QGeoAreaMonitorInfo b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoAreaMonitorInfo similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoAreaMonitorInfo rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoAreaMonitorInfo diff --git a/libs/qtlocation/include/QtPositioning/QGeoAreaMonitorSource b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoAreaMonitorSource similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoAreaMonitorSource rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoAreaMonitorSource diff --git a/libs/qtlocation/include/QtPositioning/QGeoCircle b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoCircle similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoCircle rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoCircle diff --git a/libs/qtlocation/include/QtPositioning/QGeoCoordinate b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoCoordinate similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoCoordinate rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoCoordinate diff --git a/libs/qtlocation/include/QtPositioning/QGeoLocation b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoLocation similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoLocation rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoLocation diff --git a/libs/qtlocation/include/QtPositioning/QGeoPositionInfo b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoPositionInfo similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoPositionInfo rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoPositionInfo diff --git a/libs/qtlocation/include/QtPositioning/QGeoPositionInfoSource b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoPositionInfoSource similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoPositionInfoSource rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoPositionInfoSource diff --git a/libs/qtlocation/include/QtPositioning/QGeoPositionInfoSourceFactory b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoPositionInfoSourceFactory similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoPositionInfoSourceFactory rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoPositionInfoSourceFactory diff --git a/libs/qtlocation/include/QtPositioning/QGeoRectangle b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoRectangle similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoRectangle rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoRectangle diff --git a/libs/qtlocation/include/QtPositioning/QGeoSatelliteInfo b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoSatelliteInfo similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoSatelliteInfo rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoSatelliteInfo diff --git a/libs/qtlocation/include/QtPositioning/QGeoSatelliteInfoSource b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoSatelliteInfoSource similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoSatelliteInfoSource rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoSatelliteInfoSource diff --git a/libs/qtlocation/include/QtPositioning/QGeoShape b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoShape similarity index 100% rename from libs/qtlocation/include/QtPositioning/QGeoShape rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QGeoShape diff --git a/libs/qtlocation/include/QtPositioning/QNmeaPositionInfoSource b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QNmeaPositionInfoSource similarity index 100% rename from libs/qtlocation/include/QtPositioning/QNmeaPositionInfoSource rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QNmeaPositionInfoSource diff --git a/libs/qtlocation/include/QtPositioning/QtPositioning b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QtPositioning similarity index 100% rename from libs/qtlocation/include/QtPositioning/QtPositioning rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QtPositioning diff --git a/libs/qtlocation/include/QtPositioning/QtPositioningVersion b/src/QtLocationPlugin/qtlocation/include/QtPositioning/QtPositioningVersion similarity index 100% rename from libs/qtlocation/include/QtPositioning/QtPositioningVersion rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/QtPositioningVersion diff --git a/libs/qtlocation/include/QtPositioning/qgeoaddress.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeoaddress.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeoaddress.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeoaddress.h diff --git a/libs/qtlocation/include/QtPositioning/qgeoareamonitorinfo.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeoareamonitorinfo.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeoareamonitorinfo.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeoareamonitorinfo.h diff --git a/libs/qtlocation/include/QtPositioning/qgeoareamonitorsource.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeoareamonitorsource.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeoareamonitorsource.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeoareamonitorsource.h diff --git a/libs/qtlocation/include/QtPositioning/qgeocircle.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeocircle.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeocircle.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeocircle.h diff --git a/libs/qtlocation/include/QtPositioning/qgeocoordinate.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeocoordinate.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeocoordinate.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeocoordinate.h diff --git a/libs/qtlocation/include/QtPositioning/qgeolocation.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeolocation.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeolocation.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeolocation.h diff --git a/libs/qtlocation/include/QtPositioning/qgeopositioninfo.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeopositioninfo.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeopositioninfo.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeopositioninfo.h diff --git a/libs/qtlocation/include/QtPositioning/qgeopositioninfosource.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeopositioninfosource.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeopositioninfosource.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeopositioninfosource.h diff --git a/libs/qtlocation/include/QtPositioning/qgeopositioninfosourcefactory.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeopositioninfosourcefactory.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeopositioninfosourcefactory.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeopositioninfosourcefactory.h diff --git a/libs/qtlocation/include/QtPositioning/qgeorectangle.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeorectangle.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeorectangle.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeorectangle.h diff --git a/libs/qtlocation/include/QtPositioning/qgeosatelliteinfo.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeosatelliteinfo.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeosatelliteinfo.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeosatelliteinfo.h diff --git a/libs/qtlocation/include/QtPositioning/qgeosatelliteinfosource.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeosatelliteinfosource.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeosatelliteinfosource.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeosatelliteinfosource.h diff --git a/libs/qtlocation/include/QtPositioning/qgeoshape.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeoshape.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qgeoshape.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qgeoshape.h diff --git a/libs/qtlocation/include/QtPositioning/qnmeapositioninfosource.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qnmeapositioninfosource.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qnmeapositioninfosource.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qnmeapositioninfosource.h diff --git a/libs/qtlocation/include/QtPositioning/qpositioningglobal.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qpositioningglobal.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qpositioningglobal.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qpositioningglobal.h diff --git a/libs/qtlocation/include/QtPositioning/qtpositioningversion.h b/src/QtLocationPlugin/qtlocation/include/QtPositioning/qtpositioningversion.h similarity index 100% rename from libs/qtlocation/include/QtPositioning/qtpositioningversion.h rename to src/QtLocationPlugin/qtlocation/include/QtPositioning/qtpositioningversion.h diff --git a/libs/qtlocation/src/location/maps/maps.pri b/src/QtLocationPlugin/qtlocation/src/location/maps/maps.pri similarity index 100% rename from libs/qtlocation/src/location/maps/maps.pri rename to src/QtLocationPlugin/qtlocation/src/location/maps/maps.pri diff --git a/libs/qtlocation/src/location/maps/qcache3q_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qcache3q_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qcache3q_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qcache3q_p.h diff --git a/libs/qtlocation/src/location/maps/qgeocameracapabilities_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeocameracapabilities_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeocameracapabilities_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeocameracapabilities_p.h diff --git a/libs/qtlocation/src/location/maps/qgeocameradata_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeocameradata_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeocameradata_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeocameradata_p.h diff --git a/libs/qtlocation/src/location/maps/qgeocameratiles_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeocameratiles_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeocameratiles_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeocameratiles_p.h diff --git a/libs/qtlocation/src/location/maps/qgeocodereply.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodereply.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeocodereply.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodereply.h diff --git a/libs/qtlocation/src/location/maps/qgeocodereply_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodereply_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeocodereply_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodereply_p.h diff --git a/libs/qtlocation/src/location/maps/qgeocodingmanager.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodingmanager.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeocodingmanager.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodingmanager.h diff --git a/libs/qtlocation/src/location/maps/qgeocodingmanager_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodingmanager_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeocodingmanager_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodingmanager_p.h diff --git a/libs/qtlocation/src/location/maps/qgeocodingmanagerengine.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodingmanagerengine.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeocodingmanagerengine.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodingmanagerengine.h diff --git a/libs/qtlocation/src/location/maps/qgeocodingmanagerengine_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodingmanagerengine_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeocodingmanagerengine_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeocodingmanagerengine_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomaneuver.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomaneuver.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomaneuver.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomaneuver.h diff --git a/libs/qtlocation/src/location/maps/qgeomaneuver_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomaneuver_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomaneuver_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomaneuver_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomap_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomap_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomap_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomap_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomap_p_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomap_p_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomap_p_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomap_p_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomapcontroller_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomapcontroller_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomapcontroller_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomapcontroller_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomappingmanager_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomappingmanager_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomappingmanager_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomappingmanager_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomappingmanager_p_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomappingmanager_p_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomappingmanager_p_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomappingmanager_p_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomappingmanagerengine_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomappingmanagerengine_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomappingmanagerengine_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomappingmanagerengine_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomappingmanagerengine_p_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomappingmanagerengine_p_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomappingmanagerengine_p_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomappingmanagerengine_p_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomapscene_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomapscene_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomapscene_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomapscene_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomaptype_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomaptype_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomaptype_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomaptype_p.h diff --git a/libs/qtlocation/src/location/maps/qgeomaptype_p_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeomaptype_p_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeomaptype_p_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeomaptype_p_p.h diff --git a/libs/qtlocation/src/location/maps/qgeoroute.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroute.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroute.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroute.h diff --git a/libs/qtlocation/src/location/maps/qgeoroute_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroute_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroute_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroute_p.h diff --git a/libs/qtlocation/src/location/maps/qgeoroutereply.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutereply.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroutereply.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutereply.h diff --git a/libs/qtlocation/src/location/maps/qgeoroutereply_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutereply_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroutereply_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutereply_p.h diff --git a/libs/qtlocation/src/location/maps/qgeorouterequest.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeorouterequest.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeorouterequest.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeorouterequest.h diff --git a/libs/qtlocation/src/location/maps/qgeorouterequest_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeorouterequest_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeorouterequest_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeorouterequest_p.h diff --git a/libs/qtlocation/src/location/maps/qgeoroutesegment.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutesegment.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroutesegment.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutesegment.h diff --git a/libs/qtlocation/src/location/maps/qgeoroutesegment_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutesegment_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroutesegment_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutesegment_p.h diff --git a/libs/qtlocation/src/location/maps/qgeoroutingmanager.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutingmanager.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroutingmanager.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutingmanager.h diff --git a/libs/qtlocation/src/location/maps/qgeoroutingmanager_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutingmanager_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroutingmanager_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutingmanager_p.h diff --git a/libs/qtlocation/src/location/maps/qgeoroutingmanagerengine.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutingmanagerengine.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroutingmanagerengine.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutingmanagerengine.h diff --git a/libs/qtlocation/src/location/maps/qgeoroutingmanagerengine_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutingmanagerengine_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoroutingmanagerengine_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoroutingmanagerengine_p.h diff --git a/libs/qtlocation/src/location/maps/qgeoserviceprovider.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceprovider.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoserviceprovider.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceprovider.h diff --git a/libs/qtlocation/src/location/maps/qgeoserviceprovider_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceprovider_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoserviceprovider_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceprovider_p.h diff --git a/libs/qtlocation/src/location/maps/qgeoserviceproviderfactory.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceproviderfactory.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeoserviceproviderfactory.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceproviderfactory.h diff --git a/libs/qtlocation/src/location/maps/qgeotilecache_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilecache_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotilecache_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilecache_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotiledmap_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmap_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotiledmap_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmap_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotiledmap_p_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmap_p_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotiledmap_p_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmap_p_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmappingmanagerengine_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotiledmappingmanagerengine_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmappingmanagerengine_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotiledmappingmanagerengine_p_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmappingmanagerengine_p_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotiledmappingmanagerengine_p_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmappingmanagerengine_p_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotiledmapreply_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmapreply_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotiledmapreply_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmapreply_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotiledmapreply_p_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmapreply_p_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotiledmapreply_p_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotiledmapreply_p_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotilefetcher_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilefetcher_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotilefetcher_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilefetcher_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotilefetcher_p_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilefetcher_p_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotilefetcher_p_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilefetcher_p_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotilerequestmanager_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilerequestmanager_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotilerequestmanager_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilerequestmanager_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotilespec_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilespec_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotilespec_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilespec_p.h diff --git a/libs/qtlocation/src/location/maps/qgeotilespec_p_p.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilespec_p_p.h similarity index 100% rename from libs/qtlocation/src/location/maps/qgeotilespec_p_p.h rename to src/QtLocationPlugin/qtlocation/src/location/maps/qgeotilespec_p_p.h diff --git a/libs/qtlocation/src/location/qlocation.h b/src/QtLocationPlugin/qtlocation/src/location/qlocation.h similarity index 100% rename from libs/qtlocation/src/location/qlocation.h rename to src/QtLocationPlugin/qtlocation/src/location/qlocation.h diff --git a/libs/qtlocation/src/location/qlocationglobal.h b/src/QtLocationPlugin/qtlocation/src/location/qlocationglobal.h similarity index 100% rename from libs/qtlocation/src/location/qlocationglobal.h rename to src/QtLocationPlugin/qtlocation/src/location/qlocationglobal.h diff --git a/libs/qtlocation/src/positioning/qdeclarativegeoaddress_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qdeclarativegeoaddress_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qdeclarativegeoaddress_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qdeclarativegeoaddress_p.h diff --git a/libs/qtlocation/src/positioning/qdeclarativegeolocation_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qdeclarativegeolocation_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qdeclarativegeolocation_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qdeclarativegeolocation_p.h diff --git a/libs/qtlocation/src/positioning/qdoublevector2d_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qdoublevector2d_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qdoublevector2d_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qdoublevector2d_p.h diff --git a/libs/qtlocation/src/positioning/qdoublevector3d_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qdoublevector3d_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qdoublevector3d_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qdoublevector3d_p.h diff --git a/libs/qtlocation/src/positioning/qgeoaddress.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoaddress.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeoaddress.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeoaddress.h diff --git a/libs/qtlocation/src/positioning/qgeoaddress_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoaddress_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeoaddress_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeoaddress_p.h diff --git a/libs/qtlocation/src/positioning/qgeoareamonitorinfo.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoareamonitorinfo.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeoareamonitorinfo.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeoareamonitorinfo.h diff --git a/libs/qtlocation/src/positioning/qgeoareamonitorsource.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoareamonitorsource.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeoareamonitorsource.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeoareamonitorsource.h diff --git a/libs/qtlocation/src/positioning/qgeocircle.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeocircle.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeocircle.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeocircle.h diff --git a/libs/qtlocation/src/positioning/qgeocircle_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeocircle_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeocircle_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeocircle_p.h diff --git a/libs/qtlocation/src/positioning/qgeocoordinate.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeocoordinate.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeocoordinate.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeocoordinate.h diff --git a/libs/qtlocation/src/positioning/qgeocoordinate_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeocoordinate_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeocoordinate_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeocoordinate_p.h diff --git a/libs/qtlocation/src/positioning/qgeolocation.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeolocation.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeolocation.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeolocation.h diff --git a/libs/qtlocation/src/positioning/qgeolocation_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeolocation_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeolocation_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeolocation_p.h diff --git a/libs/qtlocation/src/positioning/qgeopositioninfo.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfo.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeopositioninfo.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfo.h diff --git a/libs/qtlocation/src/positioning/qgeopositioninfosource.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosource.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeopositioninfosource.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosource.h diff --git a/libs/qtlocation/src/positioning/qgeopositioninfosource_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosource_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeopositioninfosource_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosource_p.h diff --git a/libs/qtlocation/src/positioning/qgeopositioninfosourcefactory.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosourcefactory.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeopositioninfosourcefactory.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosourcefactory.h diff --git a/libs/qtlocation/src/positioning/qgeoprojection_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoprojection_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeoprojection_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeoprojection_p.h diff --git a/libs/qtlocation/src/positioning/qgeorectangle.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeorectangle.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeorectangle.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeorectangle.h diff --git a/libs/qtlocation/src/positioning/qgeorectangle_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeorectangle_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeorectangle_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeorectangle_p.h diff --git a/libs/qtlocation/src/positioning/qgeosatelliteinfo.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeosatelliteinfo.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeosatelliteinfo.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeosatelliteinfo.h diff --git a/libs/qtlocation/src/positioning/qgeosatelliteinfosource.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeosatelliteinfosource.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeosatelliteinfosource.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeosatelliteinfosource.h diff --git a/libs/qtlocation/src/positioning/qgeoshape.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoshape.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeoshape.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeoshape.h diff --git a/libs/qtlocation/src/positioning/qgeoshape_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoshape_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qgeoshape_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qgeoshape_p.h diff --git a/libs/qtlocation/src/positioning/qlocationutils_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qlocationutils_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qlocationutils_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qlocationutils_p.h diff --git a/libs/qtlocation/src/positioning/qnmeapositioninfosource.h b/src/QtLocationPlugin/qtlocation/src/positioning/qnmeapositioninfosource.h similarity index 100% rename from libs/qtlocation/src/positioning/qnmeapositioninfosource.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qnmeapositioninfosource.h diff --git a/libs/qtlocation/src/positioning/qnmeapositioninfosource_p.h b/src/QtLocationPlugin/qtlocation/src/positioning/qnmeapositioninfosource_p.h similarity index 100% rename from libs/qtlocation/src/positioning/qnmeapositioninfosource_p.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qnmeapositioninfosource_p.h diff --git a/libs/qtlocation/src/positioning/qpositioningglobal.h b/src/QtLocationPlugin/qtlocation/src/positioning/qpositioningglobal.h similarity index 100% rename from libs/qtlocation/src/positioning/qpositioningglobal.h rename to src/QtLocationPlugin/qtlocation/src/positioning/qpositioningglobal.h diff --git a/src/main.cc b/src/main.cc index 3fa649377c45f4b9af6819a415f0721a99c1da1f..a3a156750f65ae6eb196f5b44463a81642e62ca0 100644 --- a/src/main.cc +++ b/src/main.cc @@ -140,8 +140,8 @@ int main(int argc, char *argv[]) #ifndef __mobile__ qRegisterMetaType(); #endif - - // We statically link to the google QtLocation plugin + + // We statically link our own QtLocation plugin #ifdef Q_OS_WIN // In Windows, the compiler doesn't see the use of the class created by Q_IMPORT_PLUGIN