diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2016-11-21 13:04:47 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2016-11-22 09:28:33 +0000 |
| commit | 81b42ba2508241cdeeecdbcdac6f1d22be922022 (patch) | |
| tree | 45c74a9b64737133e0e689ec31da9eb0357e40e5 | |
| parent | 396d57ae906bf6273eb3924929f4fccdf211c46f (diff) | |
| download | qtlocation-81b42ba2508241cdeeecdbcdac6f1d22be922022.tar.gz | |
Add Q_LOCATION_PRIVATE_EXPORT to QGeoMapPrivate
This patch privately exports QGeoMapPrivate, effectively making it
possible to subclass QGeoMap directly.
Change-Id: Ib373eff5ab6782c832464d2df3484d2790ea3644
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/location/maps/qgeomap_p.h | 4 | ||||
| -rw-r--r-- | src/location/maps/qgeomap_p_p.h | 7 | ||||
| -rw-r--r-- | tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h index 339d6dfb..c45b1a0c 100644 --- a/src/location/maps/qgeomap_p.h +++ b/src/location/maps/qgeomap_p.h @@ -47,8 +47,8 @@ // We mean it. // -#include "qgeocameradata_p.h" -#include "qgeomaptype_p.h" +#include <QtLocation/private/qgeocameradata_p.h> +#include <QtLocation/private/qgeomaptype_p.h> #include <QtCore/QObject> #include <QtPositioning/private/qdoublevector2d_p.h> diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h index f09d55c2..f72c35ba 100644 --- a/src/location/maps/qgeomap_p_p.h +++ b/src/location/maps/qgeomap_p_p.h @@ -47,8 +47,9 @@ // We mean it. // -#include "qgeocameradata_p.h" -#include "qgeomaptype_p.h" +#include <QtLocation/private/qlocationglobal_p.h> +#include <QtLocation/private/qgeocameradata_p.h> +#include <QtLocation/private/qgeomaptype_p.h> #include <QtCore/private/qobject_p.h> #include <QtCore/QSize> @@ -59,7 +60,7 @@ class QGeoMappingManagerEngine; class QGeoMap; class QGeoMapController; -class QGeoMapPrivate : public QObjectPrivate +class Q_LOCATION_PRIVATE_EXPORT QGeoMapPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QGeoMap) public: diff --git a/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro b/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro index f629a154..d061f18f 100644 --- a/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro +++ b/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro @@ -6,4 +6,4 @@ INCLUDEPATH += ../../../src/location/maps SOURCES += tst_qgeocameracapabilities.cpp -QT += location positioning-private testlib +QT += location-private positioning-private testlib |