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

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits)
  Regressions in Global Object prototype access
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )
  Autotest: fix paths on the test server after update.
  Fix typo in docs.
  Corruption in data captured by QAudioInput
  Just one (static) waveInCriticalSection but multiple QAudioInput to
  Mismatch between reported and actual supported sample rates in
  Remove qWait functions as it is used in QTRY_* macros.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda )
  Fix crash for multiscript text in QTextEngine::boundingBox()
  Fixed modal dialog not to have automatic "Exit" right softkey in S60.
  Remove qWait functions as it is used in QTRY_* macros.
  QAudioInput: possible change of state without emitting stateChange()
  Did not include updated repaint number for parent item in revert.
  Implementing QFontEngineS60::getSfntTableData()
  Fix doc for deprecated QGridLayout::colSpacing: point to existing method
  qDebug() << myPointF would remove spaces in following arguments.
  Fix crash in the fileiconprovider for Windows
  Partially revert "Remove qWait functions as it is used in QTRY_* macros."
  Remove qWait functions as it is used in QTRY_* macros.
  ...

1 files changed, 12 insertions, 1 deletions

diff --git a/tests/auto/qbrush/tst_qbrush.cpp b/tests/auto/qbrush/tst_qbrush.cpp
index 628e859..7e94f37 100644
--- a/tests/auto/qbrush/tst_qbrush.cpp
+++ b/tests/auto/qbrush/tst_qbrush.cpp
@@ -75,9 +75,10 @@ private slots:
     void gradientStops();
 
     void textures();
-    
+
     void nullBrush();
     void isOpaque();
+    void debug();
 };
 
 Q_DECLARE_METATYPE(QBrush)
@@ -399,5 +400,15 @@ void tst_QBrush::isOpaque()
     QVERIFY(!brush.isOpaque());
 }
 
+void tst_QBrush::debug()
+{
+    QPixmap pixmap_source(10, 10);
+    fill(&pixmap_source);
+    QBrush pixmap_brush;
+    pixmap_brush.setTexture(pixmap_source);
+    QCOMPARE(pixmap_brush.style(), Qt::TexturePattern);
+    qDebug() << pixmap_brush; // don't crash
+}
+
 QTEST_MAIN(tst_QBrush)
 #include "tst_qbrush.moc"