diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-11 01:01:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-11 01:01:15 +0200 |
| commit | 50d41f14eecc32e374ca34f76d45d65684a640c8 (patch) | |
| tree | 1c38a164c1604139103aa69d88e8d184112f1b11 /qmake | |
| parent | e1fd6074935cd0be0df14d89eb0244fcbd1677cf (diff) | |
| parent | 5e421957de544224511c4823a4829ed2a34317d0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I14f539ccfa4ab6e21188b98c314bdb030f3b9f70
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/metamakefile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index b8b93bc8cb..7776d77008 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -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); |