Merge commit 'qt/master-stable' into 4.6-stable

Bring Qt 4.6 into the Qt-S60 repo.

Conflicts:
	configure.exe
	mkspecs/features/qttest_p4.prf
	qmake/generators/makefile.cpp
	src/corelib/io/qdir.cpp
	src/corelib/io/qprocess.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qobject.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/corelib/thread/qthread_p.h
	src/corelib/tools/qvector.h
	src/gui/dialogs/qdialog.cpp
	src/gui/dialogs/qfiledialog.cpp
	src/gui/dialogs/qfiledialog_p.h
	src/gui/dialogs/qmessagebox.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsview.cpp
	src/gui/image/qpixmapcache.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h
	src/gui/painting/qdrawhelper.cpp
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qmenubar.cpp
	src/network/socket/qlocalserver.cpp
	src/testlib/qtestcase.cpp
	src/testlib/testlib.pro
	tests/auto/qimagereader/tst_qimagereader.cpp
	tests/auto/qitemdelegate/tst_qitemdelegate.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qpixmap/qpixmap.pro

1 files changed, 1 insertions, 12 deletions

diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp
index 14ce0fe..b2f1dec 100644
--- a/src/scripttools/debugging/qscriptdebuggercodewidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodewidget.cpp
@@ -49,7 +49,6 @@
 #include <QtCore/qdebug.h>
 #include <QtGui/qboxlayout.h>
 #include <QtGui/qstackedwidget.h>
-#include <QtGui/qtooltip.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -197,17 +196,7 @@ void QScriptDebuggerCodeWidgetPrivate::_q_onScriptsChanged()
 void QScriptDebuggerCodeWidgetPrivate::_q_onToolTipRequest(
     const QPoint &pos, int lineNumber, const QStringList &path)
 {
-    QString tip = toolTipProvider->toolTip(/*frameIndex=*/-1, lineNumber, path);
-    if (tip.indexOf(QLatin1Char('\n')) != -1) {
-        QStringList lines = tip.split(QLatin1Char('\n'));
-        int lineCount = lines.size();
-        if (lineCount > 5) {
-            lines = lines.mid(0, 5);
-            lines.append(QString::fromLatin1("(... %0 more lines ...)").arg(lineCount - 5));
-        }
-        tip = lines.join(QLatin1String("\n"));
-    }
-    QToolTip::showText(pos, tip);
+    toolTipProvider->showToolTip(pos, /*frameIndex=*/-1, lineNumber, path);
 }
 
 QScriptDebuggerCodeWidget::QScriptDebuggerCodeWidget(QWidget *parent)