diff options
author | Christoph Keller <gri@not-censored.com> | 2018-07-02 18:41:26 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-07-09 16:37:52 +0000 |
commit | 70d9fecd0acc624a2413bd2fe362adb85880773b (patch) | |
tree | 0be6bdb25a16fe4f4b2994a9edd1d2e4745f802b /qmake | |
parent | da4dcc0893fce3555b35d931801f94f472593742 (diff) |
Fix recursive qmake xcode project generation with shadow builds
For some reason, the solution generator was looking for the xcodeproj
files in the source tree. It should look for them in the output tree
instead.
Task-number: QTBUG-69244
Change-Id: I7525886d614ddfdee705b27aacafc8f90a6f9d1d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 3206174d93..a0aea70dc5 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -149,13 +149,13 @@ ProjectBuilderMakefileGenerator::writeSubDirs(QTextStream &t) if(!qmake_setpwd(dir)) fprintf(stderr, "Cannot find directory: %s\n", dir.toLatin1().constData()); } - Option::output_dir = Option::globals->shadowedPath(QDir::cleanPath(fi.absoluteFilePath())); + Option::output_dir = Option::globals->shadowedPath(qmake_getpwd()); if(tmp_proj.read(fn)) { if(tmp_proj.first("TEMPLATE") == "subdirs") { QMakeProject *pp = new QMakeProject(&tmp_proj); pb_subdirs += new ProjectBuilderSubDirs(pp, dir); } else if(tmp_proj.first("TEMPLATE") == "app" || tmp_proj.first("TEMPLATE") == "lib") { - QString pbxproj = qmake_getpwd() + Option::dir_sep + tmp_proj.first("TARGET") + projectSuffix(); + QString pbxproj = Option::output_dir + Option::dir_sep + tmp_proj.first("TARGET") + projectSuffix(); if(!exists(pbxproj)) { warn_msg(WarnLogic, "Ignored (not found) '%s'", pbxproj.toLatin1().constData()); goto nextfile; // # Dirty! |