feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Autotests: Compile on Windows

Browse Source 
Reviewed-by: Roberto Raggi <qtc-committer@nokia.com>
This commit is contained in:
Friedemann Kleint
2009-10-26 17:26:53 +01:00
parent 4091efb47f
commit f13d4a104a
8 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/cplusplus/cplusplus-lib.pri
View File

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

2
src/libs/cplusplus/cplusplus.pro
View File

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

2
src/libs/utils/utils.pro
View File

@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = Utils TARGET = Utils
QT += gui \ QT += gui \
network network
DEFINES += QTCREATOR_UTILS_LIBRARY DEFINES += QTCREATOR_UTILS_LIB
include(../../qtcreatorlibrary.pri) include(../../qtcreatorlibrary.pri)
SOURCES += reloadpromptutils.cpp \ SOURCES += reloadpromptutils.cpp \
settingsutils.cpp \ settingsutils.cpp \

4
src/libs/utils/utils_global.h
View File

@@ -32,8 +32,10 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#if defined(QTCREATOR_UTILS_LIBRARY) #if defined(QTCREATOR_UTILS_LIB)
# define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT # define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
#elif defined(QTCREATOR_UTILS_STATIC_LIB) // Abuse single files for manual tests
# define QTCREATOR_UTILS_EXPORT
#else #else
# define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT # define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT
#endif #endif

2
src/shared/cplusplus/CPlusPlusForwardDeclarations.h
View File

@@ -54,6 +54,8 @@
# if defined(CPLUSPLUS_BUILD_LIB) # if defined(CPLUSPLUS_BUILD_LIB)
# define CPLUSPLUS_EXPORT Q_DECL_EXPORT # define CPLUSPLUS_EXPORT Q_DECL_EXPORT
# elif defined(CPLUSPLUS_BUILD_STATIC_LIB)
# define CPLUSPLUS_EXPORT
# else # else
# define CPLUSPLUS_EXPORT Q_DECL_IMPORT # define CPLUSPLUS_EXPORT Q_DECL_IMPORT
# endif # endif

2
tests/auto/cplusplus/shared/shared.pri
View File

@@ -1,4 +1,4 @@
DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
INCLUDEPATH += $$PWD/../../../../src/shared/cplusplus INCLUDEPATH += $$PWD/../../../../src/shared/cplusplus
INCLUDEPATH += $$PWD/../../../../src/libs/cplusplus INCLUDEPATH += $$PWD/../../../../src/libs/cplusplus
DEPENDPATH += $$INCLUDEPATH . DEPENDPATH += $$INCLUDEPATH .

2
tests/auto/debugger/debugger.pro
View File

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

3
tests/auto/fakevim/fakevim.pro
View File

@@ -1,6 +1,9 @@
QT += testlib QT += testlib
# Defines import symbol as empty
DEFINES+=QTCREATOR_UTILS_STATIC_LIB
FAKEVIMDIR = ../../../src/plugins/fakevim FAKEVIMDIR = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs UTILSDIR = ../../../src/libs