diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-07 15:00:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 23:51:08 +0200 |
| commit | 26dffa25391cb900c61f79d8bd327a5827973a79 (patch) | |
| tree | 295997b6e9b1fa42dc95d323503f08ff21e6858c /src | |
| parent | a9868aa8e2ea81d12ec574e2e505bc69f119f2ba (diff) | |
Use the new QT_STATIC macro from qglobal.h
This simplifies the handling of static vs shared/DLL builds.
Change-Id: I547df9bc1da3dd0dca4c621f46450328e47cab3c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qtquick1global.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/declarative/qtquick1global.h b/src/declarative/qtquick1global.h index 9e8f2a5f..ae9ed692 100644 --- a/src/declarative/qtquick1global.h +++ b/src/declarative/qtquick1global.h @@ -50,24 +50,14 @@ # undef Q_QUICK1_EXPORT #endif -#if defined(Q_OS_WIN) -# if defined(QT_MAKEDLL) /* create a Qt DLL library */ -# if defined(QT_BUILD_QUICK1_LIB) -# define Q_QUICK1_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICK1_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_QUICK1_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_QUICK1_EXPORT) -# if defined(QT_SHARED) +#ifndef QT_STATIC +# if defined(QT_BUILD_QUICK1_LIB) # define Q_QUICK1_EXPORT Q_DECL_EXPORT # else -# define Q_QUICK1_EXPORT +# define Q_QUICK1_EXPORT Q_DECL_IMPORT # endif +#else +# define Q_QUICK1_EXPORT #endif #endif // QTQUICK1GLOBAL_H |