3 files changed, 109 insertions, 1 deletions
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index 7d8af15b25..7d47a4167d 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -21,7 +21,8 @@ SUBDIRS=\
    qwindow \
    qguiapplication \
    qpixelformat \
-   qopenglwindow
+   qopenglwindow \
+   qrasterwindow
 
 !qtHaveModule(widgets): SUBDIRS -= \
    qmouseevent_modal \
diff --git a/tests/auto/gui/kernel/qrasterwindow/qrasterwindow.pro b/tests/auto/gui/kernel/qrasterwindow/qrasterwindow.pro
new file mode 100644
index 0000000000..9acd7e510a
--- /dev/null
+++ b/tests/auto/gui/kernel/qrasterwindow/qrasterwindow.pro
@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_qrasterwindow
+
+QT += core-private gui-private testlib
+
+SOURCES  += tst_qrasterwindow.cpp
diff --git a/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp b/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp
new file mode 100644
index 0000000000..78d0d0a879
--- /dev/null
+++ b/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QRasterWindow>
+#include <QtTest/QtTest>
+#include <QtGui/QPainter>
+
+class tst_QRasterWindow : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void create();
+    void basic();
+};
+
+void tst_QRasterWindow::create()
+{
+    QRasterWindow w;
+
+    w.resize(640, 480);
+    w.show();
+
+    QTest::qWaitForWindowExposed(&w);
+}
+
+class PainterWindow : public QRasterWindow
+{
+public:
+    void reset() { paintCount = 0; }
+
+    void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE {
+        ++paintCount;
+        QPainter p(this);
+        p.fillRect(QRect(0, 0, 100, 100), Qt::blue);
+        p.end();
+    }
+
+    int paintCount;
+};
+
+void tst_QRasterWindow::basic()
+{
+    PainterWindow w;
+    w.reset();
+    w.resize(400, 400);
+    w.show();
+    QTest::qWaitForWindowExposed(&w);
+
+    QVERIFY(w.paintCount >= 1);
+
+    w.reset();
+    w.update();
+    int maxWait = 1000;
+    while (w.paintCount == 0 && --maxWait > 0)
+        QTest::qWait(10);
+
+    QVERIFY(w.paintCount >= 1);
+}
+
+#include <tst_qrasterwindow.moc>
+
+QTEST_MAIN(tst_QRasterWindow)