diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-05 10:27:16 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-05 10:27:16 +0200 |
| commit | 8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe (patch) | |
| tree | 05435d06e51d4d4a3ebbbdaab6d550c634155beb /src/positioning/qpositioningglobal.h | |
| parent | 56e80eb797b55458614599a82c2264c46e6e5eb0 (diff) | |
| parent | d603bd03795b412fd7a20f4bd804e236560a90c6 (diff) | |
| download | qtlocation-8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
src/src.pro
Change-Id: Ibc0a58c565aec37fb09b96e27309f50892340cac
Diffstat (limited to 'src/positioning/qpositioningglobal.h')
| -rw-r--r-- | src/positioning/qpositioningglobal.h | 5 |
1 files changed, 1 insertions, 4 deletions
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 |