diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:03:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:03:24 +0200 |
| commit | 7050dd2930724145e2cc547bfc1281bca04e6edc (patch) | |
| tree | bfd9ec78bc41b931ec3b792fa955714b5f380ff5 /src/linguist | |
| parent | 6ed8a22dd2756557954dc85052870c0894de06ba (diff) | |
| parent | 710a54b0fe1e109b2c1c504b89f4f25b9c6d18e7 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I51fa8c90923e9730d7787e763fad996db51d350e
Diffstat (limited to 'src/linguist')
| -rw-r--r-- | src/linguist/linguist/doc/qtlinguist.qdocconf | 1 | ||||
| -rw-r--r-- | src/linguist/lrelease/main.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/linguist/linguist/doc/qtlinguist.qdocconf b/src/linguist/linguist/doc/qtlinguist.qdocconf index 8f50d966c..b082f1e62 100644 --- a/src/linguist/linguist/doc/qtlinguist.qdocconf +++ b/src/linguist/linguist/doc/qtlinguist.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qttools.qdocconf) project = QtLinguist description = Qt Linguist Manual diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp index 7ef9afe1f..7033f9eb9 100644 --- a/src/linguist/lrelease/main.cpp +++ b/src/linguist/lrelease/main.cpp @@ -180,7 +180,9 @@ static QStringList translationsFromProjects(const Projects &projects, bool topLe static QStringList translationsFromProject(const Project &project, bool topLevel) { - QStringList result = *project.translations; + QStringList result; + if (project.translations) + result = *project.translations; result << translationsFromProjects(project.subProjects, false); if (topLevel && result.isEmpty()) { printErr(LR::tr("lrelease warning: Met no 'TRANSLATIONS' entry in project file '%1'\n") |