From 0e2fbb89161ce6bd753ad9f84a5a9ed466c763f3 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 17 Jan 2012 11:37:27 -0200 Subject: [PATCH] Update the export macros in qtdeclarative.git Use the new, simpler QT_STATIC macro. Change-Id: I86d9d1a0e2812896594bfb0e6945b194f896d775 Reviewed-by: Oswald Buddenhagen --- src/particles/qtquickparticlesglobal_p.h | 20 +++++--------------- src/qml/qtqmlglobal.h | 20 +++++--------------- src/qmltest/quicktestglobal.h | 27 ++++++--------------------- 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 d7814f7..8b23fa4 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 65277e6..3744ed2 100644 --- a/src/qml/qtqmlglobal.h +++ b/src/qml/qtqmlglobal.h @@ -44,24 +44,14 @@ #include -#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 59bd643..f7633a6 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 a1d8c71..ad85b2e 100644 --- a/src/quick/qtquickglobal.h +++ b/src/quick/qtquickglobal.h @@ -44,24 +44,14 @@ #include -#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 -- 1.7.2.5