diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-12 15:48:38 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-15 08:02:31 +0000 |
| commit | 389819f133eceb6f65a2b688c0bd3468f564c2f5 (patch) | |
| tree | c46544ab8bf28acb8c705477642a3168c2f63d31 | |
| parent | d09ce15f2e2dee394001240948fcd8525697774e (diff) | |
macOS: Fix that Info.plist was overwritten in in-source builds
$$PWD and $$OUT_PWD are the same for in-source builds, so rename the
source Info.plist to avoid overwriting it with the same name (which
could easily lead to an accidental git submit of the generated file).
Change-Id: Idc593d8e00dc52f11309eae3b913799fb9b8afdf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -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 8940f2bd9a..8940f2bd9a 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 37a999fd8d..f8abf4d765 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 d0c2885c46..7d9b7ab91c 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -39,7 +39,7 @@ QtcProduct { Depends { name: "ExtensionSystem" } files: [ - "Info.plist", + "app-Info.plist", "main.cpp", "qtcreator.xcassets", "../shared/qtsingleapplication/qtsingleapplication.h", |