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

fix qbs files for MacOS

Browse Source 
Change-Id: I73dc7f853eb250ae155386674d8cb9aa1d3c1678
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Joerg Bornemann
2013-03-15 13:40:18 +01:00
parent a20dd013a7
commit c02395cc63
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,11 +57,12 @@ QtcLibrary {
result.push("botan-1.10") result.push("botan-1.10")
if (qbs.targetOS === "windows") if (qbs.targetOS === "windows")
result.push("advapi32", "user32") result.push("advapi32", "user32")
else { else if (qbs.targetOS === "linux")
result.push("rt") result.push("rt", "dl");
if (qbs.targetOS === "linux" || qbs.targetOS === "mac") else if (qbs.targetOS === "mac")
result.push("dl") result.push("dl");
} else if (qbs.targetPlatform.indexOf("unix") !== -1)
result.push("rt");
return result return result
} }
property var botanDefines: { property var botanDefines: {

6
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -31,6 +31,8 @@ QtcPlugin {
] ]
} }
cpp.frameworks: qbs.targetOS === "mac" ? ["AppKit"] : undefined
files: [ files: [
"basefilewizard.cpp", "basefilewizard.cpp",
"basefilewizard.h", "basefilewizard.h",
@@ -234,8 +236,10 @@ QtcPlugin {
} }
Group { Group {
condition: qbs.targetOS == "macx" condition: qbs.targetOS == "mac"
files: [ files: [
"macfullscreen.h",
"macfullscreen.mm",
"progressmanager/progressmanager_mac.mm", "progressmanager/progressmanager_mac.mm",
] ]
} }