Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Fix assert error on Windows with a negative char.
  Doc: Fixed the example of an encoded URL in the class description.
  Added an additional check to workaround an issue on Windows.

2 files changed, 7 insertions, 6 deletions

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 2f0fd46..3f49cc6 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -63,8 +63,9 @@
     unencoded representation is suitable for showing to users, but
     the encoded representation is typically what you would send to
     a web server. For example, the unencoded URL
-    "http://b\uuml\c{}hler.example.com" would be sent to the server as
-    "http://xn--bhler-kva.example.com/List%20of%20applicants.xml".
+    "http://b\uuml\c{}hler.example.com/List of applicants.xml" would be sent to the server as
+    "http://xn--bhler-kva.example.com/List%20of%20applicants.xml",
+    and this can be verified by calling the toEncoded() function.
 
     A URL can also be constructed piece by piece by calling
     setScheme(), setUserName(), setPassword(), setHost(), setPort(),
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index 2067716..9af7b9e 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -947,13 +947,13 @@ QString CppCodeMarker::addMarkUp(const QString &in,
 	QString tag;
         bool target = false;
 
-	if (isalpha(ch) || ch == '_') {
+	if (isalpha((unsigned char) ch) || ch == '_') {
 	    QString ident;
 	    do {
 		ident += ch;
                 finish = i;
 		readChar();
-            } while (ch >= 0 && isalnum(ch) || ch == '_');
+            } while (isalnum((unsigned char) ch) || ch == '_');
 
 	    if (classRegExp.exactMatch(ident)) {
 		tag = QLatin1String("type");
@@ -970,11 +970,11 @@ QString CppCodeMarker::addMarkUp(const QString &in,
 		    tag = QLatin1String("func");
                     target = true;
 	    }
-	} else if (isdigit(ch)) {
+	} else if (isdigit((unsigned char) ch)) {
 	    do {
                 finish = i;
 		readChar();
-	    } while (isalnum(ch) || ch == '.');
+	    } while (isalnum((unsigned char) ch) || ch == '.');
 	    tag = QLatin1String("number");
 	} else {
 	    switch (ch) {