From 57aa2f0a11354dd82a5a2482e0083e416f255b59 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 22 Jun 2012 11:02:29 +0200 Subject: Update the export macros in qtfeedback.git Use the new, simpler QT_STATIC macro. Change-Id: Idb0791760ccdbd0ba692d00b033209a4cbab365f Reviewed-by: Oswald Buddenhagen --- src/feedback/qfeedbackglobal.h | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/src/feedback/qfeedbackglobal.h b/src/feedback/qfeedbackglobal.h index 038bc8c..0ec4de8 100644 --- a/src/feedback/qfeedbackglobal.h +++ b/src/feedback/qfeedbackglobal.h @@ -44,30 +44,14 @@ #include -#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_FEEDBACK_LIB) -# define Q_FEEDBACK_EXPORT Q_DECL_EXPORT -# else -# define Q_FEEDBACK_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) -# define Q_FEEDBACK_EXPORT Q_DECL_IMPORT -# endif -#endif - -#if !defined(Q_FEEDBACK_EXPORT) -# if defined(QT_SHARED) +#ifndef QT_STATIC +# if defined(QT_BUILD_FEEDBACK_LIB) # define Q_FEEDBACK_EXPORT Q_DECL_EXPORT # else -# define Q_FEEDBACK_EXPORT +# define Q_FEEDBACK_EXPORT Q_DECL_IMPORT # endif +#else +# define Q_FEEDBACK_EXPORT #endif #endif // QFEEDBACKGLOBAL_H -- cgit v1.2.3