From c365e7e91feab7d07653e0086ba297bb1f8a6234 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Thu, 9 Jul 2009 17:03:58 +1000
Subject: Let cetest return nonzero when it fails to run a test.

---
 tools/qtestlib/wince/cetest/main.cpp | 1 +
 1 file changed, 1 insertion(+)

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;
     }
 
 
-- 
cgit v0.12


From dc2b39a866190e302eed171381c2c0384e152800 Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Thu, 9 Jul 2009 09:25:30 +0200
Subject: qdoc: Removed unnecessary error report/rule

qdoc reported an error if you used \section2 on its owin,
i.e. with no outer \section1. While strictly speaking
correct, it imposed an unnecessary restriction,
e.g. sometimes you just want to use \section2 to get a
smaller title for a section.
---
 tools/qdoc3/doc.cpp | 3 +++
 1 file changed, 3 insertions(+)

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;
-- 
cgit v0.12


From d0a36a9e33937066866ef1ecfde3eaecd578d0b7 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@nokia.com>
Date: Thu, 9 Jul 2009 10:37:26 +0200
Subject: Add QT_END_HEADER to fix compile on PowerPC Mac and make autotest
 pass.

---
 src/corelib/tools/qstring.h | 2 ++
 1 file changed, 2 insertions(+)

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
-- 
cgit v0.12