Skip to content

Commit

Permalink
qmake: Avoid writing glue project file when only generating prl files
Browse files Browse the repository at this point in the history
When qmake is run with -prl we don't need to write the glue makefile,
and doing so will end up with MakefileGenerator::writeProjectMakefile
trying to write to an invalid Option::output, resulting in warnings:

  QIODevice::write device not open

Change-Id: I196b185570e7329c621c2ccb8530b43f4be51ee6
Reviewed-by: Simon Hausmann <[email protected]>
Reviewed-by: Edward Welbourne <[email protected]>
Reviewed-by: Joerg Bornemann <[email protected]>
Reviewed-by: Tor Arne Vestbø <[email protected]>
  • Loading branch information
torarnv committed Oct 9, 2019
1 parent 0683de2 commit 9115c7a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion qmake/generators/metamakefile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ bool
BuildsMetaMakefileGenerator::write()
{
Build *glue = nullptr;
if(!makefiles.isEmpty() && !makefiles.first()->build.isNull()) {
if(!makefiles.isEmpty() && !makefiles.first()->build.isNull()
&& Option::qmake_mode != Option::QMAKE_GENERATE_PRL) {
glue = new Build;
glue->name = name;
glue->makefile = createMakefileGenerator(project, true);
Expand Down

0 comments on commit 9115c7a

Please sign in to comment.