diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-04 12:11:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-04 13:03:26 +0100 |
| commit | 7b23692538f55d499bf094a750311e1e4cd13ec6 (patch) | |
| tree | 7e85cdabe0e069ee8fcbc3da3764327b4f8e2ba2 /src/qtattributionsscanner | |
| parent | aa316d1d463777612db4b144d945bbaf67481494 (diff) | |
| parent | 32897fd0b98966d22ecbd475a0e6a77ca8b1108d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/qdoc/htmlgenerator.cpp
src/qtattributionsscanner/qdocgenerator.cpp
Done-With: Martin Smith <martin.smith@qt.io>
Change-Id: I56a23175579a1a699939179da2f35bbcd6c73367
Diffstat (limited to 'src/qtattributionsscanner')
| -rw-r--r-- | src/qtattributionsscanner/qdocgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qtattributionsscanner/qdocgenerator.cpp b/src/qtattributionsscanner/qdocgenerator.cpp index 6cab72e6e..882875ff5 100644 --- a/src/qtattributionsscanner/qdocgenerator.cpp +++ b/src/qtattributionsscanner/qdocgenerator.cpp @@ -143,7 +143,7 @@ static void generate(QTextStream &out, const Package &package, const QDir &baseD tr("Path %1 : cannot open license file %2.") .arg(QDir::toNativeSeparators(package.path)) .arg(QDir::toNativeSeparators(package.licenseFile)) - ) << "\n"; + ) << "*/\n"; return; } out << "\\badcode\n"; |