diff options
Diffstat (limited to 'src/xml')
-rw-r--r-- | src/xml/doc/qtxml.qdocconf | 2 | ||||
-rw-r--r-- | src/xml/doc/snippets/rsslisting/handler.cpp | 2 | ||||
-rw-r--r-- | src/xml/doc/snippets/simpleparse/main.cpp | 2 | ||||
-rw-r--r-- | src/xml/sax/qxml.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf index 419859ac8b..a23915487f 100644 --- a/src/xml/doc/qtxml.qdocconf +++ b/src/xml/doc/qtxml.qdocconf @@ -26,7 +26,7 @@ qhp.QtXml.subprojects.classes.sortPages = true tagfile = ../../../doc/qtxml/qtxml.tags -depends += qtcore qtnetwork qtdoc qtwidgets +depends += qtcore qtnetwork qtdoc qtwidgets qmake headerdirs += .. diff --git a/src/xml/doc/snippets/rsslisting/handler.cpp b/src/xml/doc/snippets/rsslisting/handler.cpp index 4825cf2f62..27e4a23fb4 100644 --- a/src/xml/doc/snippets/rsslisting/handler.cpp +++ b/src/xml/doc/snippets/rsslisting/handler.cpp @@ -174,7 +174,7 @@ bool Handler::characters (const QString &chars) bool Handler::fatalError (const QXmlParseException & exception) { qWarning() << "Fatal error on line" << exception.lineNumber() - << ", column" << exception.columnNumber() << ":" + << ", column" << exception.columnNumber() << ':' << exception.message(); return false; diff --git a/src/xml/doc/snippets/simpleparse/main.cpp b/src/xml/doc/snippets/simpleparse/main.cpp index 480dc1c528..cbb8ac96aa 100644 --- a/src/xml/doc/snippets/simpleparse/main.cpp +++ b/src/xml/doc/snippets/simpleparse/main.cpp @@ -78,7 +78,7 @@ int main(int argc, char **argv) for (int i = 0; i < items; ++i) { for (int j = 0; j < indentations[i]; ++j) - std::cout << " "; + std::cout << ' '; std::cout << names[i].toLocal8Bit().constData() << std::endl; } } diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 8e382f76f6..97a3b070d8 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -6457,7 +6457,7 @@ bool QXmlSimpleReaderPrivate::isExpandedEntityValueTooLarge(QString *errorMessag if (*expandedIt > entityCharacterLimit) { if (errorMessage) { *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands to a string that is too large to process (%2 characters > %3).") - .arg(entity, *expandedIt, entityCharacterLimit); + .arg(entity, QString::number(*expandedIt), QString::number(entityCharacterLimit)); } return true; } |