diff options
| author | con <qtc-committer@nokia.com> | 2009-10-27 18:23:58 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-10-27 18:23:58 +0100 |
| commit | 68f193a1890c91ecdd25e4077004ecb10cbd33de (patch) | |
| tree | ae387d5f5408407a9b5f67a388f71110d3b8a9da /src/shared/cplusplus/CPlusPlusForwardDeclarations.h | |
| parent | 78d89b549a62bb2e869dc371b565cf17c0b55e0f (diff) | |
| parent | 33fedfea6471703a7ca6967f322e89b476bde731 (diff) | |
| download | qt-creator-68f193a1890c91ecdd25e4077004ecb10cbd33de.tar.gz | |
Merge commit 'origin/1.3'
Conflicts:
src/plugins/debugger/gdb/gdbengine.cpp
Needed changes:
src/plugins/qt4projectmanager/qtversionmanager.cpp
Diffstat (limited to 'src/shared/cplusplus/CPlusPlusForwardDeclarations.h')
| -rw-r--r-- | src/shared/cplusplus/CPlusPlusForwardDeclarations.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h index 9e570d2c1a..9616f51780 100644 --- a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h +++ b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h @@ -54,6 +54,8 @@ # if defined(CPLUSPLUS_BUILD_LIB) # define CPLUSPLUS_EXPORT Q_DECL_EXPORT +# elif defined(CPLUSPLUS_BUILD_STATIC_LIB) +# define CPLUSPLUS_EXPORT # else # define CPLUSPLUS_EXPORT Q_DECL_IMPORT # endif |