diff options
| author | mread <qt-info@nokia.com> | 2009-08-05 09:32:17 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-05 09:32:17 (GMT) |
| commit | 638edc80e3b224a6830dda0a2bd3097cb82dcb96 (patch) | |
| tree | bdbb6a19e69f1388abcd032c1795ac87b13ceec1 /tests/auto/qgraphicsproxywidget | |
| parent | 867bcdcce78acca9fde2ffc57e6a304cd2e25517 (diff) | |
| parent | acd877fbff4a0c785143fcc891eae73f5b986ff9 (diff) | |
| download | Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.zip Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.tar.gz Qt-638edc80e3b224a6830dda0a2bd3097cb82dcb96.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/qgraphicsproxywidget')
| -rw-r--r-- | tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 0b1d5cf..b07d87e 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -3187,7 +3187,7 @@ void tst_QGraphicsProxyWidget::windowFlags() QVERIFY((widget->windowFlags() & widgetWFlags) == widgetWFlags); proxy.setWidget(widget); - + if (resultingProxyFlags == 0) QVERIFY(!proxy.windowFlags()); else @@ -3223,4 +3223,3 @@ QTEST_MAIN(tst_QGraphicsProxyWidget) #else // QT_NO_STYLE_CLEANLOOKS QTEST_NOOP_MAIN #endif - |