diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:14 +0100 |
| commit | dca175454aefdd019952d941c6369c314e8c3b11 (patch) | |
| tree | 82e11b9e741ba07a7a32377048f1eb823ea76903 /src/location/maps | |
| parent | 495ea425b376f5b6d65a078c4699e4b7b60a145f (diff) | |
| parent | 31ff679359172dfa068014ab0537418f5b852eac (diff) | |
| download | qtlocation-dca175454aefdd019952d941c6369c314e8c3b11.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ibd6d68ced4edbd96fb67fe61244b83d597df5775
Diffstat (limited to 'src/location/maps')
| -rw-r--r-- | src/location/maps/qgeoserviceprovider.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index 8a3dc144..7e7b3c90 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -52,24 +52,19 @@ #include <QString> #include <QVariant> -#include <QPluginLoader> #include <QDebug> #include <QStringList> #include <QCoreApplication> #include <QObject> #include <QMetaObject> #include <QMetaEnum> -#include <QProcess> -#include <QEventLoop> #include <QtCore/private/qfactoryloader_p.h> QT_BEGIN_NAMESPACE -#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, ("org.qt-project.qt.geoservice.serviceproviderfactory/5.0", QLatin1String("/geoservices"))) -#endif /*! \class QGeoServiceProvider |