xcode generator: resolve QMAKE_INFO_PLIST from source dir
If QMAKE_INFO_PLIST is set, check if the file it points to is located inside the project source dir rather than the build dir. Change-Id: I6fb176349dae8e841b5e2dfdb9f9cb87f51a1e76 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
parent
a3d72efc65
commit
a959beeeec
@ -1389,7 +1389,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
|
|||||||
if ((project->first("TEMPLATE") == "app" && project->isActiveConfig("app_bundle")) ||
|
if ((project->first("TEMPLATE") == "app" && project->isActiveConfig("app_bundle")) ||
|
||||||
(project->first("TEMPLATE") == "lib" && !project->isActiveConfig("staticlib") &&
|
(project->first("TEMPLATE") == "lib" && !project->isActiveConfig("staticlib") &&
|
||||||
project->isActiveConfig("lib_bundle"))) {
|
project->isActiveConfig("lib_bundle"))) {
|
||||||
QString plist = fileFixify(project->first("QMAKE_INFO_PLIST").toQString());
|
QString plist = fileFixify(project->first("QMAKE_INFO_PLIST").toQString(), Option::output_dir, input_dir);
|
||||||
if (plist.isEmpty())
|
if (plist.isEmpty())
|
||||||
plist = specdir() + QDir::separator() + "Info.plist." + project->first("TEMPLATE");
|
plist = specdir() + QDir::separator() + "Info.plist." + project->first("TEMPLATE");
|
||||||
if (exists(plist)) {
|
if (exists(plist)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user