path: root/qmake/generators/mac/pbuilder_pbx.h
diff options
authorTor Arne Vestbø <>2018-07-17 15:11:07 +0200
committerTor Arne Vestbø <>2018-07-31 10:13:31 +0000
commit8cea3ec8ce7f4110e849b53e3c97b690a8899dd9 (patch)
treeced62839aa69423773ea860dcb736e9a20930755 /qmake/generators/mac/pbuilder_pbx.h
parent3ed22c5efe538204a496d30b881f3999c020caa7 (diff)
qmake: Harden logic for handling the -o option
We now treat -o foo/bar/baz as a request to generate the output in the foo/bar directory with baz as the output name, or if foo/bar/baz is already a directory, in the foo/bar/baz directory with the default output name. We take care to handle generator specific directory structures, so that the project directory does not get merged into OUT_PWD. This is done in runQmake(), before parsing the project file, so that OUT_PWD will be correct during project parsing. The individual generators are then passed the filename relative to the final output directory. Each generator now also makes sure to add the right project suffix to the output file, so -o foo will result in or foo.vcproj, instead of just foo. Task-number: QTBUG-44408 Change-Id: I26990cec0c0458bee2b88dbb86322617a85f54b5 Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'qmake/generators/mac/pbuilder_pbx.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.h b/qmake/generators/mac/pbuilder_pbx.h
index 1d5cbc538d..f92436c215 100644
--- a/qmake/generators/mac/pbuilder_pbx.h
+++ b/qmake/generators/mac/pbuilder_pbx.h
@@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
class ProjectBuilderMakefileGenerator : public UnixMakefileGenerator
bool writingUnixMakefileGenerator;
- QString pbx_dir;
+ mutable QString pbx_dir;
int pbuilderVersion() const;
bool writeSubDirs(QTextStream &);
bool writeMakeParts(QTextStream &);