diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-08-05 15:38:12 -0400 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-08-06 18:42:07 +0200 |
| commit | d4bf07a974ef9830bed6dc6ffe4c8af592643969 (patch) | |
| tree | 7299672fbf2ce03973f5b702fc6d285f8dceb764 /src/tools/3rdparty | |
| parent | dc805ebcf7eed90d11a27c2abc92d2bd70ea6620 (diff) | |
| download | qt-creator-d4bf07a974ef9830bed6dc6ffe4c8af592643969.tar.gz | |
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: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/tools/3rdparty')
| -rw-r--r-- | src/tools/3rdparty/iossim/iossim.qbs | 4 | ||||
| -rw-r--r-- | src/tools/3rdparty/iossim_1_8_2/iossim.qbs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/3rdparty/iossim/iossim.qbs b/src/tools/3rdparty/iossim/iossim.qbs index d507753f15..0e3704530a 100644 --- a/src/tools/3rdparty/iossim/iossim.qbs +++ b/src/tools/3rdparty/iossim/iossim.qbs @@ -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" } diff --git a/src/tools/3rdparty/iossim_1_8_2/iossim.qbs b/src/tools/3rdparty/iossim_1_8_2/iossim.qbs index 1b96084e17..ce138f7a20 100644 --- a/src/tools/3rdparty/iossim_1_8_2/iossim.qbs +++ b/src/tools/3rdparty/iossim_1_8_2/iossim.qbs @@ -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" } |