diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:03:29 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:03:29 +0200 |
| commit | 63f9cc3763c79391ea10a99462c8081a91d1f75d (patch) | |
| tree | 1ca1b50e115bb8accd6eb721866fb3044b527c61 /src/linguist | |
| parent | 409ee927e891122d86a788049dd9f04c92e1b731 (diff) | |
| parent | 1c9613fcad7eea0e0ba6a537ecb6c2d6205dbb8c (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I7c7547f73956d0856103634a59ae3c606b80345d
Diffstat (limited to 'src/linguist')
| -rw-r--r-- | src/linguist/linguist/doc/qtlinguist.qdocconf | 1 | ||||
| -rw-r--r-- | src/linguist/linguist/messageeditor.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/linguist/linguist/doc/qtlinguist.qdocconf b/src/linguist/linguist/doc/qtlinguist.qdocconf index db0558233..8f50d966c 100644 --- a/src/linguist/linguist/doc/qtlinguist.qdocconf +++ b/src/linguist/linguist/doc/qtlinguist.qdocconf @@ -3,6 +3,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtLinguist description = Qt Linguist Manual examplesinstallpath = linguist +moduleheader = qhp.projects = QtLinguist diff --git a/src/linguist/linguist/messageeditor.cpp b/src/linguist/linguist/messageeditor.cpp index 5dad19f21..b02aa1859 100644 --- a/src/linguist/linguist/messageeditor.cpp +++ b/src/linguist/linguist/messageeditor.cpp @@ -318,7 +318,8 @@ void MessageEditor::reallyFixTabOrder() } } -/*! internal +/* + \internal Returns all translations for an item. The number of translations is dependent on if we have a plural form or not. If we don't have a plural form, then this should only contain one item. |