From a5bdecab5df352b7f9afe70afc7db57e9739178e Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Wed, 14 Feb 2018 15:14:40 +0100 Subject: Use Q_LOCATIONLABS_PRIVATE_EXPORT in locationlabs module Currently it is incorrectly using Q_LOCATION_PRIVATE_EXPORT Change-Id: Ie7e92fa5ca0379c0bf89055f975da6cf958e049e Reviewed-by: BogDan Vatra --- src/locationlabs/qlocationlabsglobal_p.h | 58 ++++++++++++++++++++++++++++++++ src/locationlabs/qmapobjectview_p.h | 3 +- src/locationlabs/qmapobjectview_p_p.h | 5 +-- src/locationlabs/qmaprouteobject_p.h | 4 +-- src/locationlabs/qmaprouteobject_p_p.h | 3 +- 5 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 src/locationlabs/qlocationlabsglobal_p.h diff --git a/src/locationlabs/qlocationlabsglobal_p.h b/src/locationlabs/qlocationlabsglobal_p.h new file mode 100644 index 00000000..aa965864 --- /dev/null +++ b/src/locationlabs/qlocationlabsglobal_p.h @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtLocation module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QLOCATIONLABSGLOBAL_P_H +#define QLOCATIONLABSGLOBAL_P_H + +#include + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_LOCATIONLABS_LIB) +# define Q_LOCATIONLABS_EXPORT Q_DECL_EXPORT +# else +# define Q_LOCATIONLABS_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_LOCATIONLABS_EXPORT +#endif + +#define Q_LOCATIONLABS_PRIVATE_EXPORT Q_LOCATIONLABS_EXPORT + +QT_END_NAMESPACE + +#endif // QLOCATIONLABSGLOBAL_P_H + diff --git a/src/locationlabs/qmapobjectview_p.h b/src/locationlabs/qmapobjectview_p.h index 80f923fd..cfdc6702 100644 --- a/src/locationlabs/qmapobjectview_p.h +++ b/src/locationlabs/qmapobjectview_p.h @@ -48,6 +48,7 @@ // We mean it. // +#include #include #include #include @@ -57,7 +58,7 @@ QT_BEGIN_NAMESPACE class QQmlDelegateModel; class QMapObjectViewPrivate; class QQmlChangeSet; -class Q_LOCATION_PRIVATE_EXPORT QMapObjectView : public QGeoMapObject +class Q_LOCATIONLABS_PRIVATE_EXPORT QMapObjectView : public QGeoMapObject { Q_OBJECT Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged) diff --git a/src/locationlabs/qmapobjectview_p_p.h b/src/locationlabs/qmapobjectview_p_p.h index bbee557e..5c0cdf82 100644 --- a/src/locationlabs/qmapobjectview_p_p.h +++ b/src/locationlabs/qmapobjectview_p_p.h @@ -49,6 +49,7 @@ // We mean it. // +#include #include #include #include @@ -58,7 +59,7 @@ QT_BEGIN_NAMESPACE class QQmlDelegateModel; class QGeoMap; -class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivate : public QGeoMapObjectPrivate +class Q_LOCATIONLABS_PRIVATE_EXPORT QMapObjectViewPrivate : public QGeoMapObjectPrivate { public: QMapObjectViewPrivate(QGeoMapObject *q); @@ -67,7 +68,7 @@ public: virtual QGeoMapObject::Type type() const override final; }; -class Q_LOCATION_PRIVATE_EXPORT QMapObjectViewPrivateDefault : public QMapObjectViewPrivate +class Q_LOCATIONLABS_PRIVATE_EXPORT QMapObjectViewPrivateDefault : public QMapObjectViewPrivate { public: QMapObjectViewPrivateDefault(QGeoMapObject *q); diff --git a/src/locationlabs/qmaprouteobject_p.h b/src/locationlabs/qmaprouteobject_p.h index dcc35807..8fca325c 100644 --- a/src/locationlabs/qmaprouteobject_p.h +++ b/src/locationlabs/qmaprouteobject_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include +#include #include #include @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeGeoRoute; class QGeoRoute; class QMapRouteObjectPrivate; -class Q_LOCATION_PRIVATE_EXPORT QMapRouteObject : public QGeoMapObject +class Q_LOCATIONLABS_PRIVATE_EXPORT QMapRouteObject : public QGeoMapObject { Q_OBJECT Q_PROPERTY(QDeclarativeGeoRoute *route READ route WRITE setRoute NOTIFY routeChanged) diff --git a/src/locationlabs/qmaprouteobject_p_p.h b/src/locationlabs/qmaprouteobject_p_p.h index 113f14a0..8dbfc6b4 100644 --- a/src/locationlabs/qmaprouteobject_p_p.h +++ b/src/locationlabs/qmaprouteobject_p_p.h @@ -48,13 +48,14 @@ // We mean it. // +#include #include #include QT_BEGIN_NAMESPACE class QGeoRoute; -class Q_LOCATION_PRIVATE_EXPORT QMapRouteObjectPrivate : public QGeoMapObjectPrivate +class Q_LOCATIONLABS_PRIVATE_EXPORT QMapRouteObjectPrivate : public QGeoMapObjectPrivate { public: QMapRouteObjectPrivate(QGeoMapObject *q); -- cgit v1.2.3