From c02395cc6357fdb312d1426770e75cc4bd0a39b7 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 15 Mar 2013 13:40:18 +0100 Subject: [PATCH] fix qbs files for MacOS Change-Id: I73dc7f853eb250ae155386674d8cb9aa1d3c1678 Reviewed-by: Christian Kandeler --- src/libs/ssh/ssh.qbs | 11 ++++++----- src/plugins/coreplugin/coreplugin.qbs | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs index 66984954c24..edc5663c914 100644 --- a/src/libs/ssh/ssh.qbs +++ b/src/libs/ssh/ssh.qbs @@ -57,11 +57,12 @@ QtcLibrary { result.push("botan-1.10") if (qbs.targetOS === "windows") result.push("advapi32", "user32") - else { - result.push("rt") - if (qbs.targetOS === "linux" || qbs.targetOS === "mac") - result.push("dl") - } + else if (qbs.targetOS === "linux") + result.push("rt", "dl"); + else if (qbs.targetOS === "mac") + result.push("dl"); + else if (qbs.targetPlatform.indexOf("unix") !== -1) + result.push("rt"); return result } property var botanDefines: { diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 03c50361d1d..8501f6940a7 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -31,6 +31,8 @@ QtcPlugin { ] } + cpp.frameworks: qbs.targetOS === "mac" ? ["AppKit"] : undefined + files: [ "basefilewizard.cpp", "basefilewizard.h", @@ -234,8 +236,10 @@ QtcPlugin { } Group { - condition: qbs.targetOS == "macx" + condition: qbs.targetOS == "mac" files: [ + "macfullscreen.h", + "macfullscreen.mm", "progressmanager/progressmanager_mac.mm", ] }