diff options
| author | alex <alex.blasche@nokia.com> | 2011-10-17 14:55:00 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-17 09:36:32 +0200 |
| commit | c8dc39b3cee6567db3d5dd80e8d1218afe06143a (patch) | |
| tree | a014f3f0dc81371cdc4405c5950f532612ad8d17 /src/location/qlocationglobal.h | |
| parent | 8daddab3ede4ec758c2606cc22095da5626b3138 (diff) | |
| download | qtlocation-c8dc39b3cee6567db3d5dd80e8d1218afe06143a.tar.gz | |
First step of removal of Q_LOCATION_EXPORT macro from qglobal.h
Each module handles each its own exports. We need to change the
QtLocation version, remove the qglobal.h define and then add it back
under the old name in QtLocation
Change-Id: I7530a251b78402215a466cd55a33ec24664786b7
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/location/qlocationglobal.h')
| -rw-r--r-- | src/location/qlocationglobal.h | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/src/location/qlocationglobal.h b/src/location/qlocationglobal.h new file mode 100644 index 00000000..75bef671 --- /dev/null +++ b/src/location/qlocationglobal.h @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtLocation module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 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 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QLOCATIONGLOBAL_H +#define QLOCATIONGLOBAL_H + +#include <QtCore/qglobal.h> + +#if defined(Q_OS_WIN) +# if defined(QT_NODLL) +# undef QT_MAKEDLL +# undef QT_DLL +# elif defined(QT_MAKEDLL) +# if defined(QT_DLL) +# undef QT_DLL +# endif +# if defined(QT_BUILD_LOCATION_LIB) +# define Q_LOCATION_EXPORT_TEMP Q_DECL_EXPORT +# else +# define Q_LOCATION_EXPORT_TEMP Q_DECL_IMPORT +# endif +# elif defined(QT_DLL) +# define Q_LOCATION_EXPORT_TEMP Q_DECL_EXPORT +# endif +#endif + +#if !defined(Q_LOCATION_EXPORT_TEMP) +# if defined(QT_SHARED) +# define Q_LOCATION_EXPORT_TEMP Q_DECL_EXPORT +# else +# define Q_LOCATION_EXPORT_TEMP +# endif +#endif + +#endif // QLOCATIONGLOBAL_H + |