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

Botan: Do not link against QtCore, QtGui.

Browse Source 
Clear the QT variable and pass the include paths for QtCore
such that QtGlobal is still found.
This makes it possible to build Qt Creator in debug mode on
Windows since the .pro-file additionally specifies 'release',
which causes link errors (QtCore4.lib, QtGui4.lib not found
in debug builds).

Change-Id: I75bcd00cd6f7b598972dca5e3d969949d325e3f6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-08-22 10:51:32 +02:00
parent 4893dd39cd
commit 6887d28e09
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/3rdparty/botan/botan.pro vendored
View File

@@ -3,6 +3,7 @@ TARGET = Botan
PRECOMPILED_HEADER = ../precompiled_headers/botan_pch.h PRECOMPILED_HEADER = ../precompiled_headers/botan_pch.h
QT =
CONFIG += exceptions CONFIG += exceptions
CONFIG += release CONFIG += release
@@ -10,7 +11,7 @@ CONFIG -= debug debug_and_release
include(../../../qtcreatorlibrary.pri) include(../../../qtcreatorlibrary.pri)
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += . $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_HEADERS]/QtCore
DEFINES += BOTAN_DLL=Q_DECL_EXPORT DEFINES += BOTAN_DLL=Q_DECL_EXPORT
unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \ unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \