diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
| commit | 084c5b3db794af1ce86b2b17455d9be5e64baebe (patch) | |
| tree | 46d29a7b89ff251c07b6fdd59c57e30f14baa64a /src/tools/qdoc/doc.cpp | |
| parent | f4a0d6d2494d1dd41cd5b854a48b435120714d32 (diff) | |
| parent | 54987c6bf55b159d3ddb79461439700f6e0111f9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
Diffstat (limited to 'src/tools/qdoc/doc.cpp')
| -rw-r--r-- | src/tools/qdoc/doc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp index ff9b9900bf5..04d673e7484 100644 --- a/src/tools/qdoc/doc.cpp +++ b/src/tools/qdoc/doc.cpp @@ -1068,7 +1068,7 @@ void DocParser::parse(const QString& source, } if (!inTableHeader && !inTableRow) { - location().warning(tr("Missing '\\%1' or '\\%1' before '\\%3'") + location().warning(tr("Missing '\\%1' or '\\%2' before '\\%3'") .arg(cmdName(CMD_HEADER)) .arg(cmdName(CMD_ROW)) .arg(cmdName(CMD_LI))); @@ -1190,7 +1190,7 @@ void DocParser::parse(const QString& source, leavePara(); p1 = getRestOfLine(); if (p1.isEmpty()) - location().warning(tr("Missing format name after '\\%1") + location().warning(tr("Missing format name after '\\%1'") .arg(cmdName(CMD_RAW))); append(Atom::FormatIf, p1); append(Atom::RawString, untabifyEtc(getUntilEnd(cmd))); |