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 /src/qml/qtqmlglobal.h | |
| 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>
Diffstat (limited to 'src/qml/qtqmlglobal.h')
| -rw-r--r-- | src/qml/qtqmlglobal.h | 20 |
1 files changed, 5 insertions, 15 deletions
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 |