From 389819f133eceb6f65a2b688c0bd3468f564c2f5 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 12 Jan 2018 15:48:38 +0100 Subject: [PATCH] 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 Reviewed-by: Jake Petroules --- src/app/{Info.plist => app-Info.plist} | 0 src/app/app.pro | 2 +- src/app/app.qbs | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/app/{Info.plist => app-Info.plist} (100%) diff --git a/src/app/Info.plist b/src/app/app-Info.plist similarity index 100% rename from src/app/Info.plist rename to 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 d0c2885c461..7d9b7ab91c4 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",