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

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Add the download URI for smart installer package to documentation
  Catch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053
  rename trk -> symbianutils
  Catch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b
  Fixed defect in handling of expose events for Symbian
  Added qwidget test case which displays a native child widget
  Fix tst_QAbstractItemView::task250754_fontChange and tst_QAbstractItemView::QTBUG6407_extendedSelection for Symbian & 5800

2 files changed, 18 insertions, 4 deletions

diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
index 504ceac..ea86c16 100644
--- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
@@ -1213,14 +1213,14 @@ void tst_QAbstractItemView::task250754_fontChange()
     tree.setModel(m);
 
     w.show();
-    w.resize(150,150);
+    w.resize(150,240);
     QTest::qWait(30);
     QFont font = tree.font();
-    font.setPointSize(5);
+    font.setPixelSize(10);
     tree.setFont(font);
     QTRY_VERIFY(!tree.verticalScrollBar()->isVisible());
 
-    font.setPointSize(45);
+    font.setPixelSize(60);
     tree.setFont(font);
     //now with the huge items, the scrollbar must be visible
     QTRY_VERIFY(tree.verticalScrollBar()->isVisible());
@@ -1444,7 +1444,10 @@ void tst_QAbstractItemView::QTBUG6407_extendedSelection()
     for(int i = 0; i < 50; ++i)
         view.addItem(QString::number(i));
 
-    view.resize(200,200);
+    QFont font = view.font();
+    font.setPixelSize(10);
+    view.setFont(font);
+    view.resize(200,240);
 
     view.show();
     QApplication::setActiveWindow(&view);
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 03eddee..b59017b 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -250,6 +250,7 @@ private slots:
 #else
     void persistentWinId();
 #endif
+    void showNativeChild();
     void qobject_castInDestroyedSlot();
 
     void showHideEvent_data();
@@ -4586,6 +4587,16 @@ void tst_QWidget::persistentWinId()
 }
 #endif // Q_OS_SYMBIAN
 
+void tst_QWidget::showNativeChild()
+{
+    QWidget topLevel;
+    topLevel.setGeometry(0, 0, 100, 100);
+    QWidget child(&topLevel);
+    child.winId();
+    topLevel.show();
+    QTest::qWaitForWindowShown(&topLevel);
+}
+
 class ShowHideEventWidget : public QWidget
 {
 public: