diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-06 15:24:00 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-06 16:02:29 +0000 |
| commit | 181511ef5c8a86c09a1bd953bdfd5fa603515148 (patch) | |
| tree | a1c34e457bc1c5659e23db6e2e60072e51cf07f7 | |
| parent | d8ad5946227c7546b8daef71c139ac38be4c5617 (diff) | |
Fix build with -no-feature-library
Drop unnecessary guards around QFactoryLoader (which is available
without QLibrary) and drop an unused include.
Change-Id: I0368eb857474fc728f1dad76977758b6d773f1d6
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/location/maps/qgeoserviceprovider.cpp | 2 | ||||
| -rw-r--r-- | src/positioning/qgeopositioninfosource.cpp | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index cf5fe7e5..7e7b3c90 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -62,11 +62,9 @@ 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 diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp index facace97..d7a9278c 100644 --- a/src/positioning/qgeopositioninfosource.cpp +++ b/src/positioning/qgeopositioninfosource.cpp @@ -46,17 +46,14 @@ #include <QJsonObject> #include <QCryptographicHash> #include <QtCore/private/qfactoryloader_p.h> -#include <QtCore/private/qlibrary_p.h> #include <algorithm> QT_BEGIN_NAMESPACE -#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, ("org.qt-project.qt.position.sourcefactory/5.0", QLatin1String("/position"))) -#endif /*! \class QGeoPositionInfoSource |