diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-15 09:54:48 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-15 09:54:48 +0100 |
| commit | b3e24fbfd4f683fcec98fcab57e7369d5d2956e2 (patch) | |
| tree | 13579810020203d510ae9d4342077d9ac0c747cb /src/app | |
| parent | 924921ee3b7812feb236e748abf90b7eab62780e (diff) | |
| parent | 0af3a2d29a03d9fb097f0dc5f3ee7807ef6ab13b (diff) | |
Merge remote-tracking branch 'origin/4.6'
Change-Id: I0feaa243e4f9e5d6b0ee0c8b86b0d8b3a4949567
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/app-Info.plist (renamed from src/app/Info.plist) | 0 | ||||
| -rw-r--r-- | src/app/app.pro | 2 | ||||
| -rw-r--r-- | src/app/app.qbs | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/app/Info.plist b/src/app/app-Info.plist index 8940f2bd9ab..8940f2bd9ab 100644 --- a/src/app/Info.plist +++ b/src/app/app-Info.plist diff --git a/src/app/app.pro b/src/app/app.pro index 37a999fd8da..f8abf4d7659 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -59,7 +59,7 @@ win32 { } } - infoplist = $$cat($$PWD/Info.plist, blob) + infoplist = $$cat($$PWD/app-Info.plist, blob) infoplist = $$replace(infoplist, @MACOSX_DEPLOYMENT_TARGET@, $$QMAKE_MACOSX_DEPLOYMENT_TARGET) infoplist = $$replace(infoplist, @QTCREATOR_COPYRIGHT_YEAR@, $$QTCREATOR_COPYRIGHT_YEAR) write_file($$OUT_PWD/Info.plist, infoplist) diff --git a/src/app/app.qbs b/src/app/app.qbs index 0a5bc82583d..e3d9f027f0c 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -38,7 +38,7 @@ QtcProduct { Depends { name: "ExtensionSystem" } files: [ - "Info.plist", + "app-Info.plist", "main.cpp", "qtcreator.xcassets", "../shared/qtsingleapplication/qtsingleapplication.h", |