diff options
| author | kh1 <karsten.heimrich@digia.com> | 2012-11-21 16:34:53 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-11-21 17:53:20 +0100 |
| commit | 541399200a32580ef8d29af15cceae689ad1ce56 (patch) | |
| tree | 9ece2f79d5d99cfa478a1495032fa6ba149ee97b /src | |
| parent | ad57af73451c1db60a39d7f5f75a8d6530f138ff (diff) | |
Adjust to make it build with Qt5.
Change-Id: I697b6987da45d1afe7620e2114fd2d4bcf15c7ce
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/installer_global.h | 14 | ||||
| -rw-r--r-- | src/libs/kdtools/kdtools.pri | 4 | ||||
| -rw-r--r-- | src/libs/kdtools/kdtoolsglobal.h | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/libs/installer/installer_global.h b/src/libs/installer/installer_global.h index 51091cd49..b6074ff4f 100644 --- a/src/libs/installer/installer_global.h +++ b/src/libs/installer/installer_global.h @@ -28,14 +28,14 @@ #include <QtCore/QtGlobal> -#ifdef LIB_INSTALLER_SHARED -#ifdef BUILD_LIB_INSTALLER -#define INSTALLER_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# ifdef BUILD_LIB_INSTALLER +# define INSTALLER_EXPORT Q_DECL_EXPORT +# else +# define INSTALLER_EXPORT Q_DECL_IMPORT +# endif #else -#define INSTALLER_EXPORT Q_DECL_IMPORT -#endif -#else -#define INSTALLER_EXPORT +# define INSTALLER_EXPORT #endif #endif //INSTALLER_GLOBAL_H diff --git a/src/libs/kdtools/kdtools.pri b/src/libs/kdtools/kdtools.pri index 70385fd2e..cc9fd52fb 100644 --- a/src/libs/kdtools/kdtools.pri +++ b/src/libs/kdtools/kdtools.pri @@ -1,8 +1,6 @@ INCLUDEPATH += $$PWD -CONFIG(shared, static|shared) { - DEFINES += BUILD_SHARED_KDTOOLS -} +DEFINES += BUILD_SHARED_KDTOOLS FORMS += $$PWD/authenticationdialog.ui diff --git a/src/libs/kdtools/kdtoolsglobal.h b/src/libs/kdtools/kdtoolsglobal.h index 8199724c4..8ce4d5224 100644 --- a/src/libs/kdtools/kdtoolsglobal.h +++ b/src/libs/kdtools/kdtoolsglobal.h @@ -25,7 +25,7 @@ #include <QtCore/QtGlobal> -#ifdef KDTOOLS_SHARED +#ifndef QT_STATIC # ifdef BUILD_SHARED_KDTOOLS # define KDTOOLS_EXPORT Q_DECL_EXPORT # else |