From f13d4a104ad34c6fdfffddd19b9bb243c3e56f35 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 26 Oct 2009 17:26:53 +0100
Subject: [PATCH] Autotests: Compile on Windows Reviewed-by: Roberto Raggi
<qtc-committer@nokia.com>
---
src/libs/cplusplus/cplusplus-lib.pri | 7 ++++++-
src/libs/cplusplus/cplusplus.pro | 2 +-
src/libs/utils/utils.pro | 2 +-
src/libs/utils/utils_global.h | 4 +++-
src/shared/cplusplus/CPlusPlusForwardDeclarations.h | 2 ++
tests/auto/cplusplus/shared/shared.pri | 2 +-
tests/auto/debugger/debugger.pro | 2 +-
tests/auto/fakevim/fakevim.pro | 3 +++
8 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri
index 812dbe0c9a4..2e50a401333 100644
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -1,4 +1,9 @@
-DEFINES += CPLUSPLUS_BUILD_LIB
+contains(CONFIG, dll) {
+ DEFINES += CPLUSPLUS_BUILD_LIB
+} else {
+ DEFINES += CPLUSPLUS_BUILD_STATIC_LIB
+}
+
INCLUDEPATH += $$PWD
include(../../shared/cplusplus/cplusplus.pri)
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index a6e804439ba..88c6b18e3d3 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -1,5 +1,5 @@
TEMPLATE = lib
-
+CONFIG+=dll
TARGET = CPlusPlus
DEFINES += NDEBUG
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index 74939e2f063..88687c63b43 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = Utils
QT += gui \
network
-DEFINES += QTCREATOR_UTILS_LIBRARY
+DEFINES += QTCREATOR_UTILS_LIB
include(../../qtcreatorlibrary.pri)
SOURCES += reloadpromptutils.cpp \
settingsutils.cpp \
diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h
index a36b6e728b5..f158766087e 100644
--- a/src/libs/utils/utils_global.h
+++ b/src/libs/utils/utils_global.h
@@ -32,8 +32,10 @@
#include <QtCore/qglobal.h>
-#if defined(QTCREATOR_UTILS_LIBRARY)
+#if defined(QTCREATOR_UTILS_LIB)
# define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
+#elif defined(QTCREATOR_UTILS_STATIC_LIB) // Abuse single files for manual tests
+# define QTCREATOR_UTILS_EXPORT
#else
# define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT
#endif
diff --git a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/src/shared/cplusplus/CPlusPlusForwardDeclarations.h
index 9e570d2c1af..9616f51780d 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
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index 80dab035ba8..9b173daa613 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -1,4 +1,4 @@
-
+DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
INCLUDEPATH += $$PWD/../../../../src/shared/cplusplus
INCLUDEPATH += $$PWD/../../../../src/libs/cplusplus
DEPENDPATH += $$INCLUDEPATH .
diff --git a/tests/auto/debugger/debugger.pro b/tests/auto/debugger/debugger.pro
index ef1547f9ce6..c4cadd3715f 100644
--- a/tests/auto/debugger/debugger.pro
+++ b/tests/auto/debugger/debugger.pro
@@ -1,5 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS = dumpers.pro plugin.pro gdb.pro
+SUBDIRS = dumpers.pro plugin.pro
diff --git a/tests/auto/fakevim/fakevim.pro b/tests/auto/fakevim/fakevim.pro
index a4aaea078ed..84c1029e3a6 100644
--- a/tests/auto/fakevim/fakevim.pro
+++ b/tests/auto/fakevim/fakevim.pro
@@ -1,6 +1,9 @@
QT += testlib
+# Defines import symbol as empty
+DEFINES+=QTCREATOR_UTILS_STATIC_LIB
+
FAKEVIMDIR = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs
--
GitLab