From 09c7f93e8d8e73a59a6eef51526155a07a6db54a Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 16 Oct 2012 21:17:11 +0200
Subject: [PATCH] Fix qbs build
Change-Id: I73bed3284d491338359c730375c2b81d947dd5a4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
---
src/libs/3rdparty/botan/botan.pri | 2 +-
src/libs/ssh/ssh.qbs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri
index 7845d6081ef..1088c997326 100644
--- a/src/libs/3rdparty/botan/botan.pri
+++ b/src/libs/3rdparty/botan/botan.pri
@@ -6,7 +6,7 @@ CONFIG += exceptions
DEPENDPATH += .
-DEFINES += BOTAN_DLL="\"\""
+DEFINES += BOTAN_DLL=
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_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 8589cd2b4f4..052e80fabc2 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -51,7 +51,7 @@ QtcLibrary {
property var botanIncludes: ["../3rdparty"]
property var botanLibs: qbs.targetOS === "windows" ? ["advapi32", "user32"] : ["rt", "dl"]
property var botanDefines: {
- var result = ['BOTAN_DLL=""']
+ var result = ['BOTAN_DLL=']
if (qbs.toolchain === "msvc")
result.push("BOTAN_BUILD_COMPILER_IS_MSVC", "BOTAN_TARGET_OS_HAS_GMTIME_S")
if (qbs.toolchain === "gcc" || qbs.toolchain === "mingw")
--
GitLab