diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-07-09 08:40:35 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-07-09 08:40:35 (GMT) |
| commit | 3201ba131c9a94e938c7da09ee4323f60334ad9b (patch) | |
| tree | bcf2e0f47223ef02b5cc71385cc7cd13a36a9f65 | |
| parent | 015946b60c991593d28cd1d9383f0eb7e8c30334 (diff) | |
| parent | d0a36a9e33937066866ef1ecfde3eaecd578d0b7 (diff) | |
| download | Qt-3201ba131c9a94e938c7da09ee4323f60334ad9b.zip Qt-3201ba131c9a94e938c7da09ee4323f60334ad9b.tar.gz Qt-3201ba131c9a94e938c7da09ee4323f60334ad9b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | src/corelib/tools/qstring.h | 2 | ||||
| -rw-r--r-- | tools/qdoc3/doc.cpp | 3 | ||||
| -rw-r--r-- | tools/qtestlib/wince/cetest/main.cpp | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 6bb0d8e..235c603 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -1235,6 +1235,8 @@ inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QStringRef QT_END_NAMESPACE +QT_END_HEADER + #ifdef QT_USE_FAST_CONCATENATION #include <QtCore/qstringbuilder.h> #endif diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index 222b9a1..d5aca0e 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -1677,10 +1677,13 @@ void DocParser::startSection(Doc::SectioningUnit unit, int cmd) leavePara(); if (currentSectioningUnit == Doc::Book) { +#if 0 + // mws didn't think this was necessary. if (unit > Doc::Section1) location().warning(tr("Unexpected '\\%1' without '\\%2'") .arg(cmdName(cmd)) .arg(cmdName(CMD_SECTION1))); +#endif currentSectioningUnit = (Doc::SectioningUnit) (unit - 1); priv->constructExtra(); priv->extra->sectioningUnit = currentSectioningUnit; diff --git a/tools/qtestlib/wince/cetest/main.cpp b/tools/qtestlib/wince/cetest/main.cpp index ba3ef8d..782f6d9 100644 --- a/tools/qtestlib/wince/cetest/main.cpp +++ b/tools/qtestlib/wince/cetest/main.cpp @@ -320,6 +320,7 @@ int main(int argc, char **argv) cout << endl << "Remote Launch:" << qPrintable(TestConfiguration::remoteExecutable) << " " << qPrintable(launchArguments.join(" ")) << endl; if (!connection.execute(TestConfiguration::remoteExecutable, launchArguments.join(" "), timeout)) { cout << "Error: Could not execute target file" << endl; + return -1; } |