summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-10-13 10:50:42 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-10-13 10:53:03 (GMT)
commit1f8fae877a8f4fcaec77c7d2dc1376b7ade61aee (patch)
treea83d6de844b4a04d07edeac4e023345c000f0222
parentfc5e8bb849232cce27d5f53491cd01628abad760 (diff)
downloadQt-1f8fae877a8f4fcaec77c7d2dc1376b7ade61aee.zip
Qt-1f8fae877a8f4fcaec77c7d2dc1376b7ade61aee.tar.gz
Qt-1f8fae877a8f4fcaec77c7d2dc1376b7ade61aee.tar.bz2
Fixes tst_QGraphicsProxyWidget::setWidget_simple on Mac
the palettePropagation test tests that the palette does not propagate from the widget to the proxy. And on Mac, the default palette for the line edit is not the same as the default palette Reviewed-by: Alexis
-rw-r--r--tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 58d7896..013a028 100644
--- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -1532,7 +1532,7 @@ void tst_QGraphicsProxyWidget::setWidget_simple()
// Properties
// QCOMPARE(proxy.focusPolicy(), lineEdit->focusPolicy());
- QCOMPARE(proxy.palette(), lineEdit->palette());
+ // QCOMPARE(proxy.palette(), lineEdit->palette());
#ifndef QT_NO_CURSOR
QCOMPARE(proxy.cursor().shape(), lineEdit->cursor().shape());
#endif