From c216863cf7737f99eb00d326042a34bcfdc166b9 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Wed, 29 Aug 2012 11:50:00 +0200
Subject: [PATCH] Botan: Don't unconditionally build in release mode.

Mixing debug and release mode is a bad idea in general and does
not even work on some platforms.

Change-Id: I0e112de1f3e878c5d8f3b57789df194c772848ae
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/libs/3rdparty/botan/botan.pri | 2 +-
 src/libs/3rdparty/botan/botan.pro | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri
index f0c5bdeafbe..20832c1a7aa 100644
--- a/src/libs/3rdparty/botan/botan.pri
+++ b/src/libs/3rdparty/botan/botan.pri
@@ -1,2 +1,2 @@
 INCLUDEPATH *= $$PWD/..
-LIBS += -lBotan         # Don't use qtLibraryName. Botan is always built in release mode.
+LIBS *= -l$$qtLibraryName(Botan)
diff --git a/src/libs/3rdparty/botan/botan.pro b/src/libs/3rdparty/botan/botan.pro
index 1e7ef103cdd..92f2bd0f6a1 100644
--- a/src/libs/3rdparty/botan/botan.pro
+++ b/src/libs/3rdparty/botan/botan.pro
@@ -3,15 +3,12 @@ TARGET = Botan
 
 PRECOMPILED_HEADER = ../precompiled_headers/botan_pch.h
 
-QT =
-
 CONFIG += exceptions
-CONFIG += release
-CONFIG -= debug debug_and_release
+
 include(../../../qtcreatorlibrary.pri)
 
 DEPENDPATH += .
-INCLUDEPATH += . $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_HEADERS]/QtCore
+INCLUDEPATH += .
 
 DEFINES += BOTAN_DLL=Q_DECL_EXPORT
 unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
-- 
GitLab