Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 8d35ee0

Browse files
committed
fix import/export macros
1 parent 964a01f commit 8d35ee0

File tree

6 files changed

+42
-18
lines changed

6 files changed

+42
-18
lines changed

src/mvvmcore/qtmvvmcore_global.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@
55

66
#include "qtmvvmcore_helpertypes.h"
77

8-
#if defined(QT_BUILD_MVVMCORE_LIB)
9-
# define Q_MVVMCORE_EXPORT Q_DECL_EXPORT
8+
#ifndef QT_STATIC
9+
# if defined(QT_BUILD_MVVMCORE_LIB)
10+
# define Q_MVVMCORE_EXPORT Q_DECL_EXPORT
11+
# else
12+
# define Q_MVVMCORE_EXPORT Q_DECL_IMPORT
13+
# endif
1014
#else
11-
# define Q_MVVMCORE_EXPORT Q_DECL_IMPORT
15+
# define Q_MVVMCORE_EXPORT
1216
#endif
1317

1418
#ifndef QTMVVM_REVISION_1

src/mvvmdatasynccore/qtmvvmdatasynccore_global.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
#include <QtCore/qglobal.h>
55

6-
#if defined(QT_BUILD_MVVMDATASYNCCORE_LIB)
7-
# define Q_MVVMDATASYNCCORE_EXPORT Q_DECL_EXPORT
6+
#ifndef QT_STATIC
7+
# if defined(QT_BUILD_MVVMDATASYNCCORE_LIB)
8+
# define Q_MVVMDATASYNCCORE_EXPORT Q_DECL_EXPORT
9+
# else
10+
# define Q_MVVMDATASYNCCORE_EXPORT Q_DECL_IMPORT
11+
# endif
812
#else
9-
# define Q_MVVMDATASYNCCORE_EXPORT Q_DECL_IMPORT
13+
# define Q_MVVMDATASYNCCORE_EXPORT
1014
#endif
1115

1216
#endif // QTMVVMDATASYNCCORE_GLOBAL_H

src/mvvmdatasyncquick/qtmvvmdatasyncquick_global.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
#include <QtCore/qglobal.h>
55

6-
#if defined(QT_BUILD_MVVMDATASYNCQUICK_LIB)
7-
# define Q_MVVMDATASYNCQUICK_EXPORT Q_DECL_EXPORT
6+
#ifndef QT_STATIC
7+
# if defined(QT_BUILD_MVVMDATASYNCQUICK_LIB)
8+
# define Q_MVVMDATASYNCQUICK_EXPORT Q_DECL_EXPORT
9+
# else
10+
# define Q_MVVMDATASYNCQUICK_EXPORT Q_DECL_IMPORT
11+
# endif
812
#else
9-
# define Q_MVVMDATASYNCQUICK_EXPORT Q_DECL_IMPORT
13+
# define Q_MVVMDATASYNCQUICK_EXPORT
1014
#endif
1115

1216
namespace QtMvvm {

src/mvvmdatasyncwidgets/qtmvvmdatasyncwidgets_global.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
#include <QtCore/qglobal.h>
55

6-
#if defined(QT_BUILD_MVVMDATASYNCWIDGETS_LIB)
7-
# define Q_MVVMDATASYNCWIDGETS_EXPORT Q_DECL_EXPORT
6+
#ifndef QT_STATIC
7+
# if defined(QT_BUILD_MVVMDATASYNCWIDGETS_LIB)
8+
# define Q_MVVMDATASYNCWIDGETS_EXPORT Q_DECL_EXPORT
9+
# else
10+
# define Q_MVVMDATASYNCWIDGETS_EXPORT Q_DECL_IMPORT
11+
# endif
812
#else
9-
# define Q_MVVMDATASYNCWIDGETS_EXPORT Q_DECL_IMPORT
13+
# define Q_MVVMDATASYNCWIDGETS_EXPORT
1014
#endif
1115

1216
namespace QtMvvm {

src/mvvmquick/qtmvvmquick_global.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
#include <QtCore/qglobal.h>
55

6-
#if defined(QT_BUILD_MVVMQUICK_LIB)
7-
# define Q_MVVMQUICK_EXPORT Q_DECL_EXPORT
6+
#ifndef QT_STATIC
7+
# if defined(QT_BUILD_MVVMQUICK_LIB)
8+
# define Q_MVVMQUICK_EXPORT Q_DECL_EXPORT
9+
# else
10+
# define Q_MVVMQUICK_EXPORT Q_DECL_IMPORT
11+
# endif
812
#else
9-
# define Q_MVVMQUICK_EXPORT Q_DECL_IMPORT
13+
# define Q_MVVMQUICK_EXPORT
1014
#endif
1115

1216
#endif // QTMVVMQUICK_GLOBAL_H

src/mvvmwidgets/qtmvvmwidgets_global.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
#include <QtCore/qglobal.h>
55

6-
#if defined(QT_BUILD_MVVMWIDGETS_LIB)
7-
# define Q_MVVMWIDGETS_EXPORT Q_DECL_EXPORT
6+
#ifndef QT_STATIC
7+
# if defined(QT_BUILD_MVVMWIDGETS_LIB)
8+
# define Q_MVVMWIDGETS_EXPORT Q_DECL_EXPORT
9+
# else
10+
# define Q_MVVMWIDGETS_EXPORT Q_DECL_IMPORT
11+
# endif
812
#else
9-
# define Q_MVVMWIDGETS_EXPORT Q_DECL_IMPORT
13+
# define Q_MVVMWIDGETS_EXPORT
1014
#endif
1115

1216
#endif // QTMVVMWIDGETS_GLOBAL_H

0 commit comments

Comments
 (0)