Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	mkspecs/features/symbian/symbian_building.prf
	src/network/access/qhttpnetworkconnectionchannel.cpp

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 101baa53b5..321aa22821 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -58,6 +58,7 @@
 #include <qimagereader.h>
 #include <qimagewriter.h>
 #include <qcommonstyle.h>
+#include <qlayout.h>
 
 #include <qabstracttextdocumentlayout.h>
 #include <qtextdocumentfragment.h>
@@ -2111,6 +2112,7 @@ void tst_QTextEdit::setDocumentPreservesPalette()
     QPalette whitePal = ed->palette();
     whitePal.setColor(QPalette::Active, QPalette::Text, "white");
 
+
     QVERIFY(whitePal != ed->palette());
     ed->setPalette(whitePal);
     QVERIFY(whitePal.color(QPalette::Active, QPalette::Text)
@@ -2155,6 +2157,9 @@ void tst_QTextEdit::pasteFromQt3RichText()
 
 void tst_QTextEdit::noWrapBackgrounds()
 {
+    QWidget topLevel;
+    QVBoxLayout *layout = new QVBoxLayout(&topLevel);
+
     QTextEdit edit;
     edit.setLineWrapMode(QTextEdit::NoWrap);
 
@@ -2170,6 +2175,11 @@ void tst_QTextEdit::noWrapBackgrounds()
     edit.insertPlainText(QLatin1String(" \n  \n   \n    \n"));
     edit.setFixedSize(100, 200);
 
+    layout->addWidget(&edit);
+    topLevel.show();
+
+    QTest::qWait(1000);
+
     QImage img = QPixmap::grabWidget(edit.viewport()).toImage();
     QCOMPARE(img, img.mirrored(true, false));
 }