diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-10-16 21:17:11 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-10-17 10:41:55 +0200 |
| commit | 09c7f93e8d8e73a59a6eef51526155a07a6db54a (patch) | |
| tree | e805264485fda35299f9717162cb29829f17e1c7 | |
| parent | e0a7c98507c38e152d2cfcf691ef62825adc7f43 (diff) | |
Fix qbs buildv2.6.0-rctqtc/v2.6.0-rc
Change-Id: I73bed3284d491338359c730375c2b81d947dd5a4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/libs/3rdparty/botan/botan.pri | 2 | ||||
| -rw-r--r-- | 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 7845d6081e..1088c99732 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 8589cd2b4f..052e80fabc 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") |