aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/corelib.qbs
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-04-15 17:44:55 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-04-15 17:45:24 +0200
commitadeb73931197ad6b6cc42ae573bca94d7500c860 (patch)
treec4d9f8413eeaa62b7bf33358ff414d986005a878 /src/lib/corelib/corelib.qbs
parent4c99d114d30dac54ff624843b535a3e24b2022b9 (diff)
parente31446f563ec8fb1f23e073a97017a5661fbede9 (diff)
Merge remote-tracking branch 'origin/1.5'
Diffstat (limited to 'src/lib/corelib/corelib.qbs')
-rw-r--r--src/lib/corelib/corelib.qbs13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index b57f859ad..d20378764 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -3,7 +3,7 @@ import QbsFunctions
QbsLibrary {
Depends { name: "cpp" }
- Depends { name: "Qt"; submodules: ["script", "xml"] }
+ Depends { name: "Qt"; submodules: ["core-private", "network", "script", "xml"] }
Depends { condition: project.enableProjectFileUpdates; name: "Qt.gui" }
Depends { condition: project.enableUnitTests; name: "Qt.test" }
name: "qbscore"
@@ -31,7 +31,7 @@ QbsLibrary {
Properties {
condition: qbs.targetOS.contains("darwin")
- cpp.frameworks: "Foundation"
+ cpp.frameworks: ["Foundation", "Security"]
}
Group {
@@ -409,6 +409,15 @@ QbsLibrary {
]
}
Group {
+ condition: qbs.targetOS.contains("osx")
+ name: "tools (OS X)"
+ prefix: "tools/"
+ files: [
+ "applecodesignutils.cpp",
+ "applecodesignutils.h"
+ ]
+ }
+ Group {
condition: qbs.targetOS.contains("unix")
name: "tools (Unix)"
prefix: "tools/"