From 6887d28e092f0d35e97116667ce0abaf05dd09f5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 22 Aug 2012 10:51:32 +0200 Subject: [PATCH] Botan: Do not link against QtCore, QtGui. 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 Reviewed-by: Christian Kandeler --- src/libs/3rdparty/botan/botan.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/3rdparty/botan/botan.pro b/src/libs/3rdparty/botan/botan.pro index 0a0e72b4388..964c5868ae2 100644 --- a/src/libs/3rdparty/botan/botan.pro +++ b/src/libs/3rdparty/botan/botan.pro @@ -3,6 +3,7 @@ TARGET = Botan PRECOMPILED_HEADER = ../precompiled_headers/botan_pch.h +QT = CONFIG += exceptions CONFIG += release @@ -10,7 +11,7 @@ CONFIG -= debug debug_and_release include(../../../qtcreatorlibrary.pri) DEPENDPATH += . -INCLUDEPATH += . +INCLUDEPATH += . $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_HEADERS]/QtCore DEFINES += BOTAN_DLL=Q_DECL_EXPORT unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \