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

Botan: Don't unconditionally build in release mode.

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2012-08-29 11:50:00 +02:00
committed by Friedemann Kleint
parent 2cf04cb248
commit c216863cf7
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/botan/botan.pri vendored
View File

@@ -1,2 +1,2 @@
INCLUDEPATH *= $$PWD/.. INCLUDEPATH *= $$PWD/..
LIBS += -lBotan # Don't use qtLibraryName. Botan is always built in release mode. LIBS *= -l$$qtLibraryName(Botan)

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

@@ -3,15 +3,12 @@ TARGET = Botan
PRECOMPILED_HEADER = ../precompiled_headers/botan_pch.h PRECOMPILED_HEADER = ../precompiled_headers/botan_pch.h
QT =
CONFIG += exceptions CONFIG += exceptions
CONFIG += release
CONFIG -= debug debug_and_release
include(../../../qtcreatorlibrary.pri) include(../../../qtcreatorlibrary.pri)
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_HEADERS]/QtCore INCLUDEPATH += .
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 \