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

3 files changed, 48 insertions, 4 deletions

diff --git a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/qdbusinterface/tst_qdbusinterface.cpp
index 826bd70..d8ff2d3 100644
--- a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp
+++ b/tests/auto/qdbusinterface/tst_qdbusinterface.cpp
@@ -157,6 +157,18 @@ public slots:
     }
 };
 
+class DerivedFromQDBusInterface: public QDBusInterface
+{
+    Q_OBJECT
+public:
+    DerivedFromQDBusInterface()
+        : QDBusInterface("com.example.Test", "/")
+    {}
+
+public slots:
+    void method() {}
+};
+
 // helper function
 void emitSignal(const QString &interface, const QString &name, const QString &arg)
 {
@@ -183,6 +195,7 @@ private slots:
 
     void notConnected();
     void notValid();
+    void notValidDerived();
     void invalidAfterServiceOwnerChanged();
     void introspect();
     void callMethod();
@@ -219,6 +232,7 @@ void tst_QDBusInterface::notConnected()
                              connection);
 
     QVERIFY(!interface.isValid());
+    QVERIFY(!QMetaObject::invokeMethod(&interface, "ListNames", Qt::DirectConnection));
 }
 
 void tst_QDBusInterface::notValid()
@@ -230,6 +244,14 @@ void tst_QDBusInterface::notValid()
                              connection);
 
     QVERIFY(!interface.isValid());
+    QVERIFY(!QMetaObject::invokeMethod(&interface, "ListNames", Qt::DirectConnection));
+}
+
+void tst_QDBusInterface::notValidDerived()
+{
+    DerivedFromQDBusInterface c;
+    QVERIFY(!c.isValid());
+    QMetaObject::invokeMethod(&c, "method", Qt::DirectConnection);
 }
 
 void tst_QDBusInterface::invalidAfterServiceOwnerChanged()
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 5e889f4..d0752af 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -3665,6 +3665,22 @@ void tst_QGraphicsView::update()
 #endif
 }
 
+class FocusItem : public QGraphicsRectItem
+{
+public:
+    FocusItem() : QGraphicsRectItem(0, 0, 20, 20) {
+        m_viewHasIMEnabledInFocusInEvent = false;
+    }
+
+    void focusInEvent(QFocusEvent *event)
+    {
+        QGraphicsView *view = scene()->views().first();
+        m_viewHasIMEnabledInFocusInEvent = view->testAttribute(Qt::WA_InputMethodEnabled);
+    }
+
+    bool m_viewHasIMEnabledInFocusInEvent;
+};
+
 void tst_QGraphicsView::inputMethodSensitivity()
 {
     QGraphicsScene scene;
@@ -3674,7 +3690,7 @@ void tst_QGraphicsView::inputMethodSensitivity()
     QApplication::setActiveWindow(&view);
     QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
 
-    QGraphicsRectItem *item = new QGraphicsRectItem;
+    FocusItem *item = new FocusItem;
 
     view.setAttribute(Qt::WA_InputMethodEnabled, true);
 
@@ -3703,6 +3719,7 @@ void tst_QGraphicsView::inputMethodSensitivity()
     scene.setFocusItem(item);
     QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true);
+    QCOMPARE(item->m_viewHasIMEnabledInFocusInEvent, true);
 
     item->setFlag(QGraphicsItem::ItemAcceptsInputMethod, false);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false);
@@ -3711,15 +3728,17 @@ void tst_QGraphicsView::inputMethodSensitivity()
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true);
 
     // introduce another item that is focusable but does not accept input methods
-    QGraphicsRectItem *item2 = new QGraphicsRectItem;
+    FocusItem *item2 = new FocusItem;
     item2->setFlag(QGraphicsItem::ItemIsFocusable);
     scene.addItem(item2);
     scene.setFocusItem(item2);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false);
+    QCOMPARE(item2->m_viewHasIMEnabledInFocusInEvent, false);
     QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item2));
 
     scene.setFocusItem(item);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true);
+    QCOMPARE(item->m_viewHasIMEnabledInFocusInEvent, true);
     QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
 
     view.setScene(0);
@@ -3728,10 +3747,12 @@ void tst_QGraphicsView::inputMethodSensitivity()
 
     view.setScene(&scene);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true);
+    QCOMPARE(item->m_viewHasIMEnabledInFocusInEvent, true);
     QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
 
     scene.setFocusItem(item2);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false);
+    QCOMPARE(item2->m_viewHasIMEnabledInFocusInEvent, false);
     QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item2));
 
     view.setScene(0);
@@ -3744,6 +3765,7 @@ void tst_QGraphicsView::inputMethodSensitivity()
 
     view.setScene(&scene);
     QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true);
+    QCOMPARE(item->m_viewHasIMEnabledInFocusInEvent, true);
     QCOMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(item));
 }
 
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp
index 0cff2fd..0818b4c 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/selftests/tst_selftests.cpp
@@ -131,11 +131,11 @@ static QList<QByteArray> splitLines(QByteArray ba)
             if (index == -1) {
                 continue;
             }
-            int end = line.indexOf('"', index + strlen(markers[j][0]) + 1);
+            int end = line.indexOf('"', index + strlen(markers[j][0]));
             if (end == -1) {
                 continue;
             }
-            line.replace(index, end-index, markers[j][1]);
+            line.replace(index, end-index + 1, markers[j][1]);
         }
     }