diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-12 16:01:19 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-12 16:09:40 (GMT) |
| commit | f55d36cea933d801d421562f3d8b6b2ff0fb0fc1 (patch) | |
| tree | 232e71bc6f471b049799caae12fad154a47224e5 /tests | |
| parent | bc53cf1334738307110a661f19b6fbb9be9b72d6 (diff) | |
| download | Qt-f55d36cea933d801d421562f3d8b6b2ff0fb0fc1.zip Qt-f55d36cea933d801d421562f3d8b6b2ff0fb0fc1.tar.gz Qt-f55d36cea933d801d421562f3d8b6b2ff0fb0fc1.tar.bz2 | |
Fixes tst_QProxyWidget::palettePropagation on Mac
QPalette() and QApplication::palette("QLineEdit") are not the same on Mac
We really want QPalette() here because the graphics widget is not supposed
to inherit from the widget it is proxying.
Reviewed-by: Alexis
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index d016461..9db34bb 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -2795,13 +2795,13 @@ void tst_QGraphicsProxyWidget::palettePropagation() QCOMPARE(proxySpy.counts[QEvent::PaletteChange], 0); QVERIFY(edit->testAttribute(Qt::WA_SetPalette)); QVERIFY(!proxy.testAttribute(Qt::WA_SetPalette)); - QCOMPARE(proxy.palette(), lineEditPalette); + QCOMPARE(proxy.palette(), QPalette()); edit->setPalette(QPalette()); QCOMPARE(editSpy.counts[QEvent::PaletteChange], 2); QCOMPARE(proxySpy.counts[QEvent::PaletteChange], 0); QVERIFY(!edit->testAttribute(Qt::WA_SetPalette)); QVERIFY(!proxy.testAttribute(Qt::WA_SetPalette)); - QCOMPARE(proxy.palette(), lineEditPalette); + QCOMPARE(proxy.palette(), QPalette()); // Proxy to widget proxy.setPalette(palette); |