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

Fix qbs build

Browse Source 
Change-Id: I73bed3284d491338359c730375c2b81d947dd5a4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Orgad Shaneh
2012-10-16 21:17:11 +02:00
committed by Christian Kandeler
parent e0a7c98507
commit 09c7f93e8d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ CONFIG += exceptions
DEPENDPATH += . DEPENDPATH += .
DEFINES += BOTAN_DLL="\"\"" DEFINES += BOTAN_DLL=
unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \ unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \ BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \
BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO

2
src/libs/ssh/ssh.qbs
View File

@@ -51,7 +51,7 @@ QtcLibrary {
property var botanIncludes: ["../3rdparty"] property var botanIncludes: ["../3rdparty"]
property var botanLibs: qbs.targetOS === "windows" ? ["advapi32", "user32"] : ["rt", "dl"] property var botanLibs: qbs.targetOS === "windows" ? ["advapi32", "user32"] : ["rt", "dl"]
property var botanDefines: { property var botanDefines: {
var result = ['BOTAN_DLL=""'] var result = ['BOTAN_DLL=']
if (qbs.toolchain === "msvc") if (qbs.toolchain === "msvc")
result.push("BOTAN_BUILD_COMPILER_IS_MSVC", "BOTAN_TARGET_OS_HAS_GMTIME_S") result.push("BOTAN_BUILD_COMPILER_IS_MSVC", "BOTAN_TARGET_OS_HAS_GMTIME_S")
if (qbs.toolchain === "gcc" || qbs.toolchain === "mingw") if (qbs.toolchain === "gcc" || qbs.toolchain === "mingw")