1 files changed, 68 insertions, 23 deletions

diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index 148c2352a5..5188dfbcfa 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -97,6 +97,8 @@ private slots:
 
     void tst_resize_count();
     void tst_move_count();
+
+    void tst_eventfilter_on_toplevel();
 };
 
 void tst_QWidget_window::initTestCase()
@@ -336,30 +338,30 @@ void tst_QWidget_window::tst_windowFilePath()
 
 void tst_QWidget_window::tst_showWithoutActivating()
 {
-#ifndef Q_DEAD_CODE_FROM_QT4_X11
-    QSKIP("This test is X11-only.");
-#else
-    QWidget w;
-    w.show();
-    QVERIFY(QTest::qWaitForWindowExposed(&w));
-    QApplication::processEvents();
+    QString platformName = QGuiApplication::platformName().toLower();
+    if (platformName == "cocoa")
+        QSKIP("Cocoa: This fails. Figure out why.");
+    else if (platformName != QStringLiteral("xcb")
+            && platformName != QStringLiteral("windows")
+            && platformName != QStringLiteral("ios"))
+        QSKIP("Qt::WA_ShowWithoutActivating is currently supported only on xcb, windows, and ios platforms.");
+
+    QWidget w1;
+    w1.setAttribute(Qt::WA_ShowWithoutActivating);
+    w1.show();
+    QVERIFY(!QTest::qWaitForWindowActive(&w1));
 
-    QApplication::clipboard();
-    QLineEdit *lineEdit = new QLineEdit;
-    lineEdit->setAttribute(Qt::WA_ShowWithoutActivating, true);
-    lineEdit->show();
-    lineEdit->setAttribute(Qt::WA_ShowWithoutActivating, false);
-    lineEdit->raise();
-    lineEdit->activateWindow();
-
-    Window window;
-    int revertto;
-    QTRY_COMPARE(lineEdit->winId(),
-                 (XGetInputFocus(QX11Info::display(), &window, &revertto), window) );
-    // Note the use of the , before window because we want the XGetInputFocus to be re-executed
-    //     in each iteration of the inside loop of the QTRY_COMPARE macro
-
-#endif // Q_DEAD_CODE_FROM_QT4_X11
+    QWidget w2;
+    w2.show();
+    QVERIFY(QTest::qWaitForWindowActive(&w2));
+
+    QWidget w3;
+    w3.setAttribute(Qt::WA_ShowWithoutActivating);
+    w3.show();
+    QVERIFY(!QTest::qWaitForWindowActive(&w3));
+
+    w3.activateWindow();
+    QVERIFY(QTest::qWaitForWindowActive(&w3));
 }
 
 void tst_QWidget_window::tst_paintEventOnSecondShow()
@@ -762,5 +764,48 @@ void tst_QWidget_window::tst_move_count()
     QTRY_VERIFY(move.moveCount >= 1);
 }
 
+class EventFilter : public QObject
+{
+public:
+    int eventCount;
+
+    EventFilter()
+        : QObject(),
+          eventCount(0)
+    {
+    }
+
+    static QEvent::Type filterEventType()
+    {
+        static int type = QEvent::registerEventType();
+        return static_cast<QEvent::Type>(type);
+    }
+
+protected:
+    bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE
+    {
+        if (e->type() == filterEventType())
+            ++eventCount;
+
+        return QObject::eventFilter(o, e);
+    }
+};
+
+void tst_QWidget_window::tst_eventfilter_on_toplevel()
+{
+    QWidget w;
+    EventFilter filter;
+    w.installEventFilter(&filter);
+    w.show();
+    QVERIFY(QTest::qWaitForWindowActive(&w));
+    QVERIFY(w.isWindow());
+    QCOMPARE(filter.eventCount, 0);
+
+    // send an event not handled in a special way by QWidgetWindow::event,
+    // and check that it's received by the event filter
+    QCoreApplication::postEvent(w.windowHandle(), new QEvent(EventFilter::filterEventType()));
+    QTRY_COMPARE(filter.eventCount, 1);
+}
+
 QTEST_MAIN(tst_QWidget_window)
 #include "tst_qwidget_window.moc"