Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

2 files changed, 13 insertions, 8 deletions

diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp
index 64e5a9c..5607fbd 100644
--- a/tests/auto/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp
@@ -130,7 +130,7 @@ private slots:
     void testSymbols();
     void incorrectDefaultButton();
     void updateSize();
-    
+
     void setInformativeText();
     void iconPixmap();
 
@@ -683,7 +683,13 @@ void tst_QMessageBox::incorrectDefaultButton()
 void tst_QMessageBox::updateSize()
 {
     QMessageBox box;
+#ifdef Q_WS_S60
+    // In S60 messagebox is always occupies maximum width, i.e. screen width
+    // so we need to have long enough text to split over several line
+    box.setText("This is awesome long text");
+#else
     box.setText("This is awesome");
+#endif
     box.show();
     QSize oldSize = box.size();
     QString longText;
@@ -693,9 +699,12 @@ void tst_QMessageBox::updateSize()
     QVERIFY(box.size() != oldSize); // should have grown
     QVERIFY(box.width() > oldSize.width() || box.height() > oldSize.height());
     oldSize = box.size();
+#ifndef Q_WS_S60
+    // In S60 dialogs buttons are in softkey area -> message box size does not change
     box.setStandardButtons(QMessageBox::StandardButtons(0xFFFF));
     QVERIFY(box.size() != oldSize); // should have grown
     QVERIFY(box.width() > oldSize.width() || box.height() > oldSize.height());
+#endif
 }
 
 void tst_QMessageBox::setInformativeText()
diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp
index c0d7ed3..f393393 100644
--- a/tests/auto/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp
@@ -1787,21 +1787,17 @@ void tst_QTextDocument::cursorPositionChangedOnSetText()
 {
     CursorPosSignalSpy spy(doc);
 
-    cursor = QTextCursor();
+    // doc has one QTextCursor stored in the
+    // cursor member variable, thus the signal
+    // gets emitted once.
 
     doc->setPlainText("Foo\nBar\nBaz\nBlub\nBlah");
 
-    // the signal should still be emitted once for the QTextCursor that
-    // QTextDocument::setPlainText creates temporarily. But the signal
-    // should not be emitted more often.
     QCOMPARE(spy.calls, 1);
 
     spy.calls = 0;
     doc->setHtml("<p>Foo<p>Bar<p>Baz<p>Blah");
 
-    // the signal should still be emitted once for the QTextCursor that
-    // QTextDocument::setPlainText creates temporarily. But the signal
-    // should not be emitted more often.
     QCOMPARE(spy.calls, 1);
 }