From 2b054e6135cbce030a642157dc1345f9dd42950b Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 3 Nov 2013 11:22:44 +0100 Subject: Fix cutelogger with MSVC. We're compiling cutelogger directly, not as DLL. Therefore we must not add __declspec attributes to the header. Change-Id: I41b87fd4ba34dfbcd0d37245ff1c1f279139bb33 --- rbutil/rbutilqt/logger/CuteLogger_global.h | 4 ++++ rbutil/rbutilqt/rbutilqt.pro | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'rbutil') diff --git a/rbutil/rbutilqt/logger/CuteLogger_global.h b/rbutil/rbutilqt/logger/CuteLogger_global.h index 43e74affdb..c5e7680845 100644 --- a/rbutil/rbutilqt/logger/CuteLogger_global.h +++ b/rbutil/rbutilqt/logger/CuteLogger_global.h @@ -3,10 +3,14 @@ #include +#if !defined(CUTELOGGER_STATIC) #if defined(CUTELOGGER_LIBRARY) # define CUTELOGGERSHARED_EXPORT Q_DECL_EXPORT #else # define CUTELOGGERSHARED_EXPORT Q_DECL_IMPORT #endif +#else +#define CUTELOGGERSHARED_EXPORT +#endif #endif // CUTELOGGER_GLOBAL_H diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 4a4016c21d..00e0c87c8f 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -153,7 +153,7 @@ dbg { message("release") } -DEFINES += RBUTIL _LARGEFILE64_SOURCE +DEFINES += RBUTIL _LARGEFILE64_SOURCE CUTELOGGER_STATIC # check version of Qt installation !contains(QT_MAJOR_VERSION, 5):!macx { -- cgit v1.2.3