Merge commit 'qt/master'

Conflicts:
	doc/src/examples.qdoc
	doc/src/plugins-howto.qdoc
	doc/src/topics.qdoc
	examples/phonon/musicplayer/mainwindow.cpp
	src/3rdparty/freetype/src/base/ftobjs.c
	src/corelib/global/qglobal.h
	src/corelib/tools/qalgorithms.h
	src/corelib/tools/qshareddata.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/corelib/tools/tools.pri
	src/corelib/xml/qxmlstream.h
	src/gui/painting/painting.pri
	src/gui/widgets/qdatetimeedit.cpp
	tests/auto/qdesktopservices/qdesktopservices.pro
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tests/auto/qtextcodec/test/test.pro

3 files changed, 5 insertions, 16 deletions

diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp
index 1ce9ab6..40f4d6c 100644
--- a/src/scripttools/debugging/qscriptdebugger.cpp
+++ b/src/scripttools/debugging/qscriptdebugger.cpp
@@ -136,8 +136,8 @@ static bool scriptDebuggerEventCallback(void **data)
 
   \brief The QScriptDebugger class provides a Qt Script debugger.
 
-  \ingroup scripttools
-  \mainclass
+  \ingroup script
+
 */
 
 class QScriptDebuggerPrivate
diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp
index b8ed4ea..0588109 100644
--- a/src/scripttools/debugging/qscriptenginedebugger.cpp
+++ b/src/scripttools/debugging/qscriptenginedebugger.cpp
@@ -75,8 +75,8 @@ public:
 
   \brief The QScriptEngineDebugger class provides a QScriptEngine debugger.
 
-  \ingroup scripttools
-  \mainclass
+  \ingroup script
+
 
   The QScriptEngineDebugger class provides a debugger that can be
   embedded into Qt applications that use Qt Script. The debugger
diff --git a/src/scripttools/debugging/qscriptstdmessagehandler.cpp b/src/scripttools/debugging/qscriptstdmessagehandler.cpp
index e54183c..d2aa1cf 100644
--- a/src/scripttools/debugging/qscriptstdmessagehandler.cpp
+++ b/src/scripttools/debugging/qscriptstdmessagehandler.cpp
@@ -91,18 +91,7 @@ void QScriptStdMessageHandler::message(QtMsgType type, const QString &text,
     }
     msg.append(text);
 
-    FILE *fp = 0;
-    switch (type) {
-    case QtDebugMsg:
-        fp = stdout;
-        break;
-    case QtWarningMsg:
-    case QtCriticalMsg:
-    case QtFatalMsg:
-        fp = stderr;
-        break;
-    }
-
+    FILE *fp = (type == QtDebugMsg) ? stdout : stderr;
     fprintf(fp, "%s\n", msg.toLatin1().constData());
     fflush(fp);
 }