Commit d4bf07a9 authored by Jake Petroules's avatar Jake Petroules Committed by Joerg Bornemann

Let Qbs handle Info.plist embedding.

For command-line applications, Qbs embeds the Info.plist by default if
one is specified with the infoPlistFile or through other means.

Task-number: QTCREATORBUG-11492
Change-Id: I5e40cb9c1461d6ba4c178c045930017449327af3
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent dc805ebc
......@@ -20,11 +20,11 @@ QtcTool {
"dvtiphonesimulatorremoteclient/dvtiphonesimulatorremoteclient.h"
]
cpp.includePaths: ["."]
cpp.linkerFlags: base.concat(["-sectcreate", "__TEXT", "__info_plist", path + "/Info.plist",
"-fobjc-link-runtime"])
cpp.linkerFlags: base.concat(["-fobjc-link-runtime"])
cpp.frameworks: base.concat(["Foundation", "CoreServices", "ApplicationServices", "IOKit",
"AppKit"])
cpp.frameworkPaths: base.concat("/System/Library/PrivateFrameworks")
cpp.infoPlistFile: "Info.plist"
installDir: project.ide_libexec_path + "/ios"
}
......@@ -20,11 +20,11 @@ QtcTool {
"version.h",
"iphonesimulatorremoteclient/iphonesimulatorremoteclient.h"
]
cpp.linkerFlags: base.concat(["-sectcreate", "__TEXT", "__info_plist", path + "/Info.plist",
"-fobjc-link-runtime"])
cpp.linkerFlags: base.concat(["-fobjc-link-runtime"])
cpp.frameworks: base.concat(["Foundation", "CoreServices", "ApplicationServices", "IOKit",
"AppKit"])
cpp.frameworkPaths: base.concat("/System/Library/PrivateFrameworks")
cpp.infoPlistFile: "Info.plist"
toolInstallDir: project.ide_libexec_path + "/ios"
}
......@@ -15,10 +15,10 @@ QtcTool {
"iosdevicemanager.cpp",
"iosdevicemanager.h"
]
cpp.linkerFlags: base.concat(["-sectcreate", "__TEXT", "__info_plist", path + "/Info.plist"])
cpp.frameworks: base.concat(["CoreFoundation", "CoreServices", "IOKit", "Security",
"SystemConfiguration"])
cpp.dynamicLibraries: base.concat(["ssl", "bz2"])
cpp.infoPlistFile: "Info.plist"
installDir: project.ide_libexec_path + "/ios"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment