1 files changed, 65 insertions, 7 deletions

diff --git a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
index d252a0e87c..4f58178f2c 100644
--- a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
+++ b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** 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.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** 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
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -37,6 +37,7 @@
 #include "qbrush.h"
 #include <QPainter>
 #include <QBitmap>
+#include <private/qpixmap_raster_p.h>
 
 #include <qdebug.h>
 
@@ -69,6 +70,9 @@ private slots:
     void nullBrush();
     void isOpaque();
     void debug();
+
+    void textureBrushStream();
+    void textureBrushComparison();
 };
 
 
@@ -407,5 +411,59 @@ void tst_QBrush::debug()
     qDebug() << pixmap_brush; // don't crash
 }
 
+void tst_QBrush::textureBrushStream()
+{
+    QPixmap pixmap_source(10, 10);
+    QImage image_source(10, 10, QImage::Format_RGB32);
+
+    fill(&pixmap_source);
+    fill(&image_source);
+
+    QBrush pixmap_brush;
+    pixmap_brush.setTexture(pixmap_source);
+    QBrush image_brush;
+    image_brush.setTextureImage(image_source);
+
+    QByteArray data1;
+    QByteArray data2;
+    {
+        QDataStream stream1(&data1, QIODevice::WriteOnly);
+        QDataStream stream2(&data2, QIODevice::WriteOnly);
+        stream1 << pixmap_brush;
+        stream2 << image_brush;
+    }
+
+    QBrush loadedBrush1;
+    QBrush loadedBrush2;
+    {
+        QDataStream stream1(&data1, QIODevice::ReadOnly);
+        QDataStream stream2(&data2, QIODevice::ReadOnly);
+        stream1 >> loadedBrush1;
+        stream2 >> loadedBrush2;
+    }
+
+    QCOMPARE(loadedBrush1.style(), Qt::TexturePattern);
+    QCOMPARE(loadedBrush2.style(), Qt::TexturePattern);
+    QCOMPARE(loadedBrush1.texture(), pixmap_source);
+    QCOMPARE(loadedBrush2.textureImage(), image_source);
+}
+
+void tst_QBrush::textureBrushComparison()
+{
+    QImage image1(10, 10, QImage::Format_RGB32);
+    QRasterPlatformPixmap* ppixmap = new QRasterPlatformPixmap(QPlatformPixmap::PixmapType);
+    ppixmap->fromImage(image1, Qt::NoFormatConversion);
+    QPixmap pixmap(ppixmap);
+    QImage image2(image1);
+
+    QBrush pixmapBrush, imageBrush1, imageBrush2;
+    pixmapBrush.setTexture(pixmap);
+    imageBrush1.setTextureImage(image1);
+    imageBrush2.setTextureImage(image2);
+
+    QVERIFY(imageBrush1 == imageBrush2);
+    QVERIFY(pixmapBrush == imageBrush1);
+}
+
 QTEST_MAIN(tst_QBrush)
 #include "tst_qbrush.moc"