summaryrefslogtreecommitdiffstats
path: root/tests/auto/qbrush/tst_qbrush.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-09 12:23:53 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-09 12:23:53 (GMT)
commit850c3f7d9bb5fbad041dd935d1d53c5d49db0163 (patch)
tree3ebb00088919d21c51c34b3c002c41b3fd1bedbe /tests/auto/qbrush/tst_qbrush.cpp
parent19a566f82a7c684423331a8caab70ec594afd1ce (diff)
parent64a360f45ab9a1c50ca628cfd6b670b93816c756 (diff)
downloadQt-850c3f7d9bb5fbad041dd935d1d53c5d49db0163.zip
Qt-850c3f7d9bb5fbad041dd935d1d53c5d49db0163.tar.gz
Qt-850c3f7d9bb5fbad041dd935d1d53c5d49db0163.tar.bz2
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts: src/multimedia/audio/qaudioinput_win32_p.h
Diffstat (limited to 'tests/auto/qbrush/tst_qbrush.cpp')
-rw-r--r--tests/auto/qbrush/tst_qbrush.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/qbrush/tst_qbrush.cpp b/tests/auto/qbrush/tst_qbrush.cpp
index 628e859..7e94f37 100644
--- a/tests/auto/qbrush/tst_qbrush.cpp
+++ b/tests/auto/qbrush/tst_qbrush.cpp
@@ -75,9 +75,10 @@ private slots:
void gradientStops();
void textures();
-
+
void nullBrush();
void isOpaque();
+ void debug();
};
Q_DECLARE_METATYPE(QBrush)
@@ -399,5 +400,15 @@ void tst_QBrush::isOpaque()
QVERIFY(!brush.isOpaque());
}
+void tst_QBrush::debug()
+{
+ QPixmap pixmap_source(10, 10);
+ fill(&pixmap_source);
+ QBrush pixmap_brush;
+ pixmap_brush.setTexture(pixmap_source);
+ QCOMPARE(pixmap_brush.style(), Qt::TexturePattern);
+ qDebug() << pixmap_brush; // don't crash
+}
+
QTEST_MAIN(tst_QBrush)
#include "tst_qbrush.moc"