From 8d35ee058fd820ce58f1fb5124d2329e95758964 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Tue, 12 Feb 2019 18:21:22 +0100 Subject: [PATCH] fix import/export macros --- src/mvvmcore/qtmvvmcore_global.h | 10 +++++++--- src/mvvmdatasynccore/qtmvvmdatasynccore_global.h | 10 +++++++--- src/mvvmdatasyncquick/qtmvvmdatasyncquick_global.h | 10 +++++++--- src/mvvmdatasyncwidgets/qtmvvmdatasyncwidgets_global.h | 10 +++++++--- src/mvvmquick/qtmvvmquick_global.h | 10 +++++++--- src/mvvmwidgets/qtmvvmwidgets_global.h | 10 +++++++--- 6 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/mvvmcore/qtmvvmcore_global.h b/src/mvvmcore/qtmvvmcore_global.h index c25f65c..a11cbed 100644 --- a/src/mvvmcore/qtmvvmcore_global.h +++ b/src/mvvmcore/qtmvvmcore_global.h @@ -5,10 +5,14 @@ #include "qtmvvmcore_helpertypes.h" -#if defined(QT_BUILD_MVVMCORE_LIB) -# define Q_MVVMCORE_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# if defined(QT_BUILD_MVVMCORE_LIB) +# define Q_MVVMCORE_EXPORT Q_DECL_EXPORT +# else +# define Q_MVVMCORE_EXPORT Q_DECL_IMPORT +# endif #else -# define Q_MVVMCORE_EXPORT Q_DECL_IMPORT +# define Q_MVVMCORE_EXPORT #endif #ifndef QTMVVM_REVISION_1 diff --git a/src/mvvmdatasynccore/qtmvvmdatasynccore_global.h b/src/mvvmdatasynccore/qtmvvmdatasynccore_global.h index 55867c8..f0d9096 100644 --- a/src/mvvmdatasynccore/qtmvvmdatasynccore_global.h +++ b/src/mvvmdatasynccore/qtmvvmdatasynccore_global.h @@ -3,10 +3,14 @@ #include -#if defined(QT_BUILD_MVVMDATASYNCCORE_LIB) -# define Q_MVVMDATASYNCCORE_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# if defined(QT_BUILD_MVVMDATASYNCCORE_LIB) +# define Q_MVVMDATASYNCCORE_EXPORT Q_DECL_EXPORT +# else +# define Q_MVVMDATASYNCCORE_EXPORT Q_DECL_IMPORT +# endif #else -# define Q_MVVMDATASYNCCORE_EXPORT Q_DECL_IMPORT +# define Q_MVVMDATASYNCCORE_EXPORT #endif #endif // QTMVVMDATASYNCCORE_GLOBAL_H diff --git a/src/mvvmdatasyncquick/qtmvvmdatasyncquick_global.h b/src/mvvmdatasyncquick/qtmvvmdatasyncquick_global.h index de0a09b..ca864d5 100644 --- a/src/mvvmdatasyncquick/qtmvvmdatasyncquick_global.h +++ b/src/mvvmdatasyncquick/qtmvvmdatasyncquick_global.h @@ -3,10 +3,14 @@ #include -#if defined(QT_BUILD_MVVMDATASYNCQUICK_LIB) -# define Q_MVVMDATASYNCQUICK_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# if defined(QT_BUILD_MVVMDATASYNCQUICK_LIB) +# define Q_MVVMDATASYNCQUICK_EXPORT Q_DECL_EXPORT +# else +# define Q_MVVMDATASYNCQUICK_EXPORT Q_DECL_IMPORT +# endif #else -# define Q_MVVMDATASYNCQUICK_EXPORT Q_DECL_IMPORT +# define Q_MVVMDATASYNCQUICK_EXPORT #endif namespace QtMvvm { diff --git a/src/mvvmdatasyncwidgets/qtmvvmdatasyncwidgets_global.h b/src/mvvmdatasyncwidgets/qtmvvmdatasyncwidgets_global.h index fe8c708..28ac4d9 100644 --- a/src/mvvmdatasyncwidgets/qtmvvmdatasyncwidgets_global.h +++ b/src/mvvmdatasyncwidgets/qtmvvmdatasyncwidgets_global.h @@ -3,10 +3,14 @@ #include -#if defined(QT_BUILD_MVVMDATASYNCWIDGETS_LIB) -# define Q_MVVMDATASYNCWIDGETS_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# if defined(QT_BUILD_MVVMDATASYNCWIDGETS_LIB) +# define Q_MVVMDATASYNCWIDGETS_EXPORT Q_DECL_EXPORT +# else +# define Q_MVVMDATASYNCWIDGETS_EXPORT Q_DECL_IMPORT +# endif #else -# define Q_MVVMDATASYNCWIDGETS_EXPORT Q_DECL_IMPORT +# define Q_MVVMDATASYNCWIDGETS_EXPORT #endif namespace QtMvvm { diff --git a/src/mvvmquick/qtmvvmquick_global.h b/src/mvvmquick/qtmvvmquick_global.h index e8b1fd0..fa49837 100644 --- a/src/mvvmquick/qtmvvmquick_global.h +++ b/src/mvvmquick/qtmvvmquick_global.h @@ -3,10 +3,14 @@ #include -#if defined(QT_BUILD_MVVMQUICK_LIB) -# define Q_MVVMQUICK_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# if defined(QT_BUILD_MVVMQUICK_LIB) +# define Q_MVVMQUICK_EXPORT Q_DECL_EXPORT +# else +# define Q_MVVMQUICK_EXPORT Q_DECL_IMPORT +# endif #else -# define Q_MVVMQUICK_EXPORT Q_DECL_IMPORT +# define Q_MVVMQUICK_EXPORT #endif #endif // QTMVVMQUICK_GLOBAL_H diff --git a/src/mvvmwidgets/qtmvvmwidgets_global.h b/src/mvvmwidgets/qtmvvmwidgets_global.h index 9b5fdf0..0d18a18 100644 --- a/src/mvvmwidgets/qtmvvmwidgets_global.h +++ b/src/mvvmwidgets/qtmvvmwidgets_global.h @@ -3,10 +3,14 @@ #include -#if defined(QT_BUILD_MVVMWIDGETS_LIB) -# define Q_MVVMWIDGETS_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# if defined(QT_BUILD_MVVMWIDGETS_LIB) +# define Q_MVVMWIDGETS_EXPORT Q_DECL_EXPORT +# else +# define Q_MVVMWIDGETS_EXPORT Q_DECL_IMPORT +# endif #else -# define Q_MVVMWIDGETS_EXPORT Q_DECL_IMPORT +# define Q_MVVMWIDGETS_EXPORT #endif #endif // QTMVVMWIDGETS_GLOBAL_H