diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-20 07:26:51 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-05-20 07:26:51 (GMT) |
| commit | ba1491c5942239f9e0f3f283114f9ed91f43f02b (patch) | |
| tree | ecfdd2ff4b99fce5ac02780ffa8edf8668564ec6 /src/3rdparty | |
| parent | 85e940d2fa5e8d2caf0d157f214bb826fc392e7b (diff) | |
| parent | 9db91e3d4a7f3bd92c7815b3257f459f3b3de01f (diff) | |
| download | Qt-ba1491c5942239f9e0f3f283114f9ed91f43f02b.zip Qt-ba1491c5942239f9e0f3f283114f9ed91f43f02b.tar.gz Qt-ba1491c5942239f9e0f3f283114f9ed91f43f02b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/phonon/phonon_export.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/phonon/phonon_export.h b/src/3rdparty/phonon/phonon/phonon_export.h index e579f67..5f93ea0 100644 --- a/src/3rdparty/phonon/phonon/phonon_export.h +++ b/src/3rdparty/phonon/phonon/phonon_export.h @@ -32,7 +32,11 @@ # define PHONON_EXPORT Q_DECL_IMPORT # endif # else /* UNIX */ -# define PHONON_EXPORT Q_DECL_EXPORT +# ifdef MAKE_PHONON_LIB /* We are building this library */ +# define PHONON_EXPORT Q_DECL_EXPORT +# else /* We are using this library */ +# define PHONON_EXPORT Q_DECL_IMPORT +# endif # endif #endif |