diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 18:04:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 18:05:25 +0200 |
| commit | b62ae0fd804633de07d68f2f5654d2373a83f8d7 (patch) | |
| tree | 555a12d65ccd1d657e4924cdc498923b504104b1 /src/compositor/global | |
| parent | a6d8c05a25c5165164fcb6400d8342933e079139 (diff) | |
| parent | 7e6de1ded923936c2ba2a2d55d0cba2e7ff14e1e (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/compositor/wayland_wrapper/qwlcompositor.cpp
Change-Id: Ica26e33eb2b77ed5be0e84e8f4256d2e85abfaf5
Diffstat (limited to 'src/compositor/global')
| -rw-r--r-- | src/compositor/global/qwaylandexport.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compositor/global/qwaylandexport.h b/src/compositor/global/qwaylandexport.h index eed5a3b91..2812d433d 100644 --- a/src/compositor/global/qwaylandexport.h +++ b/src/compositor/global/qwaylandexport.h @@ -46,8 +46,10 @@ QT_BEGIN_NAMESPACE #if !defined(Q_COMPOSITOR_EXPORT) -# if defined(QT_SHARED) +# if defined(QT_SHARED) && defined(QT_BUILD_COMPOSITOR_LIB) # define Q_COMPOSITOR_EXPORT Q_DECL_EXPORT +# elif defined(QT_SHARED) +# define Q_COMPOSITOR_EXPORT Q_DECL_IMPORT # else # define Q_COMPOSITOR_EXPORT # endif |