feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

macOS: Fix that Info.plist was overwritten in in-source builds

Browse Source 
$$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>
This commit is contained in:
Eike Ziller
2018-01-12 15:48:38 +01:00
parent d09ce15f2e
commit 389819f133
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/app/Info.plist → src/app/app-Info.plist
View File

2
src/app/app.pro
View File

@@ -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, @MACOSX_DEPLOYMENT_TARGET@, $$QMAKE_MACOSX_DEPLOYMENT_TARGET)
infoplist = $$replace(infoplist, @QTCREATOR_COPYRIGHT_YEAR@, $$QTCREATOR_COPYRIGHT_YEAR) infoplist = $$replace(infoplist, @QTCREATOR_COPYRIGHT_YEAR@, $$QTCREATOR_COPYRIGHT_YEAR)
write_file($$OUT_PWD/Info.plist, infoplist) write_file($$OUT_PWD/Info.plist, infoplist)

2
src/app/app.qbs
View File

@@ -39,7 +39,7 @@ QtcProduct {
Depends { name: "ExtensionSystem" } Depends { name: "ExtensionSystem" }
files: [ files: [
"Info.plist", "app-Info.plist",
"main.cpp", "main.cpp",
"qtcreator.xcassets", "qtcreator.xcassets",
"../shared/qtsingleapplication/qtsingleapplication.h", "../shared/qtsingleapplication/qtsingleapplication.h",