diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:46:20 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:47:01 +0200 |
| commit | d603bd03795b412fd7a20f4bd804e236560a90c6 (patch) | |
| tree | e5e237628c04fc28283ea76a2c5ee2bfe7985529 | |
| parent | 27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76 (diff) | |
| parent | 2b7eebe5fad524abb203f2330454bacb37c95173 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I923d8eaed437dc461f98b1ed88585cc9cde528d9
| -rw-r--r-- | src/positioning/qdoublevector2d_p.h | 2 | ||||
| -rw-r--r-- | src/positioning/qdoublevector3d_p.h | 2 | ||||
| -rw-r--r-- | src/positioning/qgeoprojection_p.h | 2 | ||||
| -rw-r--r-- | src/positioning/qpositioningglobal.h | 5 |
4 files changed, 4 insertions, 7 deletions
diff --git a/src/positioning/qdoublevector2d_p.h b/src/positioning/qdoublevector2d_p.h index c3000f86..3eb77597 100644 --- a/src/positioning/qdoublevector2d_p.h +++ b/src/positioning/qdoublevector2d_p.h @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE class QDoubleVector3D; -class Q_POSITIONING_EXPORT_PRIVATE QDoubleVector2D +class Q_POSITIONING_EXPORT QDoubleVector2D { public: Q_DECL_CONSTEXPR inline QDoubleVector2D(); diff --git a/src/positioning/qdoublevector3d_p.h b/src/positioning/qdoublevector3d_p.h index 75966a36..38d6d9dc 100644 --- a/src/positioning/qdoublevector3d_p.h +++ b/src/positioning/qdoublevector3d_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE -class Q_POSITIONING_EXPORT_PRIVATE QDoubleVector3D +class Q_POSITIONING_EXPORT QDoubleVector3D { public: Q_DECL_CONSTEXPR inline QDoubleVector3D(); diff --git a/src/positioning/qgeoprojection_p.h b/src/positioning/qgeoprojection_p.h index d0280030..c31daa86 100644 --- a/src/positioning/qgeoprojection_p.h +++ b/src/positioning/qgeoprojection_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE class QGeoCoordinate; class QDoubleVector2D; -class Q_POSITIONING_EXPORT_PRIVATE QGeoProjection +class Q_POSITIONING_EXPORT QGeoProjection { public: static QDoubleVector2D coordToMercator(const QGeoCoordinate &coord); diff --git a/src/positioning/qpositioningglobal.h b/src/positioning/qpositioningglobal.h index 5d1c3dea..4a919ee6 100644 --- a/src/positioning/qpositioningglobal.h +++ b/src/positioning/qpositioningglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtPositioning module of the Qt Toolkit. @@ -48,14 +48,11 @@ QT_BEGIN_NAMESPACE #ifndef QT_STATIC # if defined(QT_BUILD_POSITIONING_LIB) # define Q_POSITIONING_EXPORT Q_DECL_EXPORT -# define Q_POSITIONING_EXPORT_PRIVATE Q_DECL_EXPORT # else # define Q_POSITIONING_EXPORT Q_DECL_IMPORT -# define Q_POSITIONING_EXPORT_PRIVATE Q_DECL_IMPORT # endif #else # define Q_POSITIONING_EXPORT -# define Q_POSITIONING_EXPORT_PRIVATE #endif |