diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-09-10 15:50:45 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-09-29 10:08:08 +0000 |
| commit | c3e93391eeb23d575d131d17c5922f9ca6347e1b (patch) | |
| tree | f1952785df90dc64ca79b1285edb5f67134c41b8 | |
| parent | b74cdf18e86ebfa0e76fdeb4407f9a347471bd98 (diff) | |
qmake: Allow non-bundle apps and libs to have an Info.plist
Change-Id: I5fe5c8d3214876520b5259d478ac9ef887c61e95
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | mkspecs/features/mac/mac.prf | 17 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/mkspecs/features/mac/mac.prf b/mkspecs/features/mac/mac.prf new file mode 100644 index 0000000000..52f06ef773 --- /dev/null +++ b/mkspecs/features/mac/mac.prf @@ -0,0 +1,17 @@ + +# Embed plist file via linker if we're not building a bundle +!isEmpty(QMAKE_INFO_PLIST) { + add_plist = false + equals(TEMPLATE, lib) { + plugin:!plugin_bundle: \ + add_plist = true + else: !plugin:!lib_bundle: \ + add_plist = true + } else: equals(TEMPLATE, app) { + !app_bundle: \ + add_plist = true + } + + $$add_plist: \ + QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote($$QMAKE_INFO_PLIST) +} diff --git a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro index e37542be65..1a76085c1b 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro +++ b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro @@ -5,5 +5,5 @@ SOURCES = tst_qcoreapplication.cpp HEADERS = tst_qcoreapplication.h win32: VERSION = 1.2.3.4 else: VERSION = 1.2.3 -darwin: QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote($$PWD/Info.plist) +QMAKE_INFO_PLIST = $$PWD/Info.plist requires(qtConfig(private_tests)) |