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

2 files changed, 88 insertions, 4 deletions

diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp
index f34fc00..be6f3dd 100644
--- a/tests/auto/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp
@@ -65,8 +65,53 @@ private slots:
     void sizeHint();
     void sizeConstraints();
     void setGeometry();
+    void setStyleShouldChangeSpacing();
 };
 
+class CustomLayoutStyle : public QWindowsStyle
+{
+    Q_OBJECT
+public:
+    CustomLayoutStyle() : QWindowsStyle()
+    {
+        hspacing = 5;
+        vspacing = 10;
+    }
+
+    virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0,
+                            const QWidget * widget = 0 ) const;
+
+    int hspacing;
+    int vspacing;
+};
+
+int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/,
+                                   const QWidget * widget /*= 0*/ ) const
+{
+    switch (metric) {
+        case PM_LayoutLeftMargin:
+            return 0;
+        break;
+        case PM_LayoutTopMargin:
+            return 3;
+        break;
+        case PM_LayoutRightMargin:
+            return 6;
+        break;
+        case PM_LayoutBottomMargin:
+            return 9;
+        break;
+        case PM_LayoutHorizontalSpacing:
+            return hspacing;
+        case PM_LayoutVerticalSpacing:
+            return vspacing;
+        break;
+        default:
+            break;
+    }
+    return QWindowsStyle::pixelMetric(metric, option, widget);
+}
+
 
 tst_QBoxLayout::tst_QBoxLayout()
 {
@@ -163,12 +208,44 @@ void tst_QBoxLayout::setGeometry()
     lay->addLayout(lay2);
     w.setLayout(lay);
     w.show();
-    
+
     QRect newGeom(0, 0, 70, 70);
     lay2->setGeometry(newGeom);
     QApplication::processEvents();
     QVERIFY2(newGeom.contains(dial->geometry()), "dial->geometry() should be smaller and within newGeom");
 }
 
+void tst_QBoxLayout::setStyleShouldChangeSpacing()
+{
+
+    QWidget *window = new QWidget;
+    QHBoxLayout *hbox = new QHBoxLayout(window);
+    QPushButton *pb1 = new QPushButton(tr("The spacing between this"));
+    QPushButton *pb2 = new QPushButton(tr("and this button should depend on the style of the parent widget"));;
+    hbox->addWidget(pb1);
+    hbox->addWidget(pb2);
+    CustomLayoutStyle *style1 = new CustomLayoutStyle;
+    style1->hspacing = 6;
+    window->setStyle(style1);
+    window->show();
+
+    QTest::qWait(100);
+    int spacing = pb2->geometry().left() - pb1->geometry().right() - 1;
+    QCOMPARE(spacing, 6);
+
+    CustomLayoutStyle *style2 = new CustomLayoutStyle();
+    style2->hspacing = 10;
+    window->setStyle(style2);
+    QTest::qWait(100);
+    spacing = pb2->geometry().left() - pb1->geometry().right() - 1;
+    QEXPECT_FAIL("", "Fix for next minor release", Continue);
+    QCOMPARE(spacing, 10);
+
+    delete window;
+    delete style1;
+    delete style2;
+}
+
+
 QTEST_MAIN(tst_QBoxLayout)
 #include "tst_qboxlayout.moc"
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index a11164f..db93fc9 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -908,7 +908,7 @@ void tst_QSharedPointer::invalidConstructs_data()
     QTest::newRow("implicit-initialization3")
         << &QTest::QExternalTest::tryCompileFail
         << "QWeakPointer<Data> ptr = new Data;";
-    QTest::newRow("implicit-initialization1")
+    QTest::newRow("implicit-initialization4")
         << &QTest::QExternalTest::tryCompileFail
         << "QWeakPointer<Data> ptr;"
            "ptr = new Data;";
@@ -972,11 +972,13 @@ void tst_QSharedPointer::invalidConstructs_data()
         << &QTest::QExternalTest::tryCompileFail
         << "QSharedPointer<Data> ptr1;\n"
            "QSharedPointer<int> ptr2 = qSharedPointerCast<int>(ptr1);";
+#ifndef QTEST_NO_RTTI
     QTest::newRow("invalid-cast2")
         << &QTest::QExternalTest::tryCompileFail
         << "QSharedPointer<Data> ptr1;\n"
            "QSharedPointer<int> ptr2 = qSharedPointerDynamicCast<int>(ptr1);";
-    QTest::newRow("implicit-initialization1")
+#endif
+    QTest::newRow("invalid-cast3")
         << &QTest::QExternalTest::tryCompileFail
         << "QSharedPointer<Data> ptr1;\n"
            "QSharedPointer<int> ptr2 = qSharedPointerConstCast<int>(ptr1);";
@@ -1024,7 +1026,12 @@ void tst_QSharedPointer::invalidConstructs()
 
     QByteArray body = code.toLatin1();
 
-    if (!(test.*testFunction)(body)) {
+    bool result = (test.*testFunction)(body);
+    if (qgetenv("QTEST_EXTERNAL_DEBUG").toInt() > 0) {
+        qDebug("External test output:");
+        printf("%s\n", test.standardError().constData());
+    }
+    if (!result) {
         qWarning("External code testing failed\nCode:\n%s\n", body.constData());
         QFAIL("Fail");
     }