diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-01-17 11:37:27 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 21:24:05 +0200 |
| commit | 0e2fbb89161ce6bd753ad9f84a5a9ed466c763f3 (patch) | |
| tree | 0e75caa69ed35612fd2e659fe7e6ec52ba4d5658 | |
| parent | db4c44a4d9ea4907329d203a61965a0dd89d69b2 (diff) | |
Update the export macros in qtdeclarative.git
Use the new, simpler QT_STATIC macro.
Change-Id: I86d9d1a0e2812896594bfb0e6945b194f896d775
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/particles/qtquickparticlesglobal_p.h | 20 | ||||
| -rw-r--r-- | src/qml/qtqmlglobal.h | 20 | ||||
| -rw-r--r-- | src/qmltest/quicktestglobal.h | 27 | ||||
| -rw-r--r-- | src/quick/qtquickglobal.h | 20 |
4 files changed, 21 insertions, 66 deletions
diff --git a/src/particles/qtquickparticlesglobal_p.h b/src/particles/qtquickparticlesglobal_p.h index d7814f759d..8b23fa44fe 100644 --- a/src/particles/qtquickparticlesglobal_p.h +++ b/src/particles/qtquickparticlesglobal_p.h @@ -46,24 +46,14 @@ // We only have private exports from this library -#if defined(Q_OS_WIN) -# if defined(QT_MAKEDLL) /* create a Qt DLL library */ -# if defined(QT_BUILD_QUICKPARTICLES_LIB) -# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_QUICKPARTICLES_PRIVATE_EXPORT) -# if defined(QT_SHARED) +#ifndef QT_STATIC +# if defined(QT_BUILD_QUICKPARTICLES_LIB) # define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_EXPORT # else -# define Q_QUICKPARTICLES_PRIVATE_EXPORT +# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_IMPORT # endif +#else +# define Q_QUICKPARTICLES_PRIVATE_EXPORT #endif #endif // QTQUICKPARTICLESGLOBAL_P_H diff --git a/src/qml/qtqmlglobal.h b/src/qml/qtqmlglobal.h index 65277e60a9..3744ed2e6b 100644 --- a/src/qml/qtqmlglobal.h +++ b/src/qml/qtqmlglobal.h @@ -44,24 +44,14 @@ #include <QtCore/qglobal.h> -#if defined(Q_OS_WIN) -# if defined(QT_MAKEDLL) /* create a Qt DLL library */ -# if defined(QT_BUILD_QML_LIB) -# define Q_QML_EXPORT Q_DECL_EXPORT -# else -# define Q_QML_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_QML_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_QML_EXPORT) -# if defined(QT_SHARED) +#ifndef QT_STATIC +# if defined(QT_BUILD_QML_LIB) # define Q_QML_EXPORT Q_DECL_EXPORT # else -# define Q_QML_EXPORT +# define Q_QML_EXPORT Q_DECL_IMPORT # endif +#else +# define Q_QML_EXPORT #endif #endif // QTQMLGLOBAL_H diff --git a/src/qmltest/quicktestglobal.h b/src/qmltest/quicktestglobal.h index 59bd643614..f7633a6d09 100644 --- a/src/qmltest/quicktestglobal.h +++ b/src/qmltest/quicktestglobal.h @@ -46,29 +46,14 @@ QT_BEGIN_HEADER -#if defined(Q_OS_WIN) -# if defined(QT_NODLL) -# undef QT_MAKEDLL -# undef QT_DLL -# elif defined(QT_MAKEDLL) /* create a Qt DLL library */ -# if defined(QT_DLL) -# undef QT_DLL -# endif -# if defined(QT_BUILD_QMLTEST_LIB) -# define Q_QUICK_TEST_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICK_TEST_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) /* use a Qt DLL library */ +#ifndef QT_STATIC +# if defined(QT_BUILD_QMLTEST_LIB) +# define Q_QUICK_TEST_EXPORT Q_DECL_EXPORT +# else # define Q_QUICK_TEST_EXPORT Q_DECL_IMPORT # endif -#endif -#if !defined(Q_QUICK_TEST_EXPORT) -# if defined(QT_SHARED) -# define Q_QUICK_TEST_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICK_TEST_EXPORT -# endif +#else +# define Q_QUICK_TEST_EXPORT #endif QT_END_HEADER diff --git a/src/quick/qtquickglobal.h b/src/quick/qtquickglobal.h index a1d8c714e8..ad85b2e96b 100644 --- a/src/quick/qtquickglobal.h +++ b/src/quick/qtquickglobal.h @@ -44,24 +44,14 @@ #include <QtCore/qglobal.h> -#if defined(Q_OS_WIN) -# if defined(QT_MAKEDLL) /* create a Qt DLL library */ -# if defined(QT_BUILD_QUICK_LIB) -# define Q_QUICK_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICK_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_QUICK_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_QUICK_EXPORT) -# if defined(QT_SHARED) +#ifndef QT_STATIC +# if defined(QT_BUILD_QUICK_LIB) # define Q_QUICK_EXPORT Q_DECL_EXPORT # else -# define Q_QUICK_EXPORT +# define Q_QUICK_EXPORT Q_DECL_IMPORT # endif +#else +# define Q_QUICK_EXPORT #endif #endif // QTQUICKGLOBAL_H |