diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-13 19:30:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-14 15:43:26 +0000 |
| commit | 4b9cdf90ca4299ffd4ec602571944ace10ef9cdc (patch) | |
| tree | 39b1b0941e2eefba07ade610f472c3f71aee6c42 /qmake | |
| parent | 957fb9fb82f6852e4d94bdce27892598e00bc677 (diff) | |
fix bogus complaints about prl targets without extension in bundles
the library inside a bundle doesn't have an extension.
this doesn't really fix anything except suppressing the error message,
as we discard the result of the operation anyway.
Change-Id: Idfe3d1714dedb59d9d3e86a65f074e516c431389
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 6f844a5c4d..a54083c04d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -915,7 +915,8 @@ MakefileGenerator::processPrlFile(QString &file) if (tgt.isEmpty()) { fprintf(stderr, "Error: %s does not define QMAKE_PRL_TARGET\n", meta_file.toLatin1().constData()); - } else if (!tgt.contains('.')) { + } else if (!tgt.contains('.') + && !libinfo.values("QMAKE_PRL_CONFIG").contains("lib_bundle")) { fprintf(stderr, "Error: %s defines QMAKE_PRL_TARGET without extension\n", meta_file.toLatin1().constData()); } else { |