Autotests: Compile on Windows

Reviewed-by: Roberto Raggi <qtc-committer@nokia.com>

src/libs/cplusplus/cplusplus-lib.pri

@@ -1,4 +1,9 @@
+contains(CONFIG, dll) {
     DEFINES += CPLUSPLUS_BUILD_LIB
+} else {
+    DEFINES += CPLUSPLUS_BUILD_STATIC_LIB
+}
+
 INCLUDEPATH += $$PWD
 
 include(../../shared/cplusplus/cplusplus.pri)

src/libs/cplusplus/cplusplus.pro

@@ -1,5 +1,5 @@
 TEMPLATE = lib
-
+CONFIG+=dll
 TARGET = CPlusPlus
 
 DEFINES += NDEBUG

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 \

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

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

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 .

tests/auto/debugger/debugger.pro

@@ -1,5 +1,5 @@
 
 TEMPLATE = subdirs
 
-SUBDIRS = dumpers.pro plugin.pro gdb.pro
+SUBDIRS = dumpers.pro plugin.pro
 

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