diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-06 06:23:07 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-06 06:23:07 (GMT) |
| commit | 57ceb11ecf95032418712a686418116cf2398e7a (patch) | |
| tree | 378533fcc07983d3a1b461aaaad07d842e50b81c /tests/auto/qgraphicsproxywidget | |
| parent | 90d4366f1e9657b3240a872698614c7d9747f9e0 (diff) | |
| parent | a4fc85c75f068b73f9c2334c77b0ae2275510e17 (diff) | |
| download | Qt-57ceb11ecf95032418712a686418116cf2398e7a.zip Qt-57ceb11ecf95032418712a686418116cf2398e7a.tar.gz Qt-57ceb11ecf95032418712a686418116cf2398e7a.tar.bz2 | |
Merge commit 'origin/master'
Conflicts:
tests/auto/qfilesystemmodel/qfilesystemmodel.pro
tests/auto/qfontdialog/tst_qfontdialog.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
tests/auto/qsqldriver/qsqldriver.pro
tests/auto/qsqlquery/qsqlquery.pro
tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
tests/auto/qsqltablemodel/qsqltablemodel.pro
tests/auto/qsqlthread/qsqlthread.pro
tests/auto/qstatemachine/tst_qstatemachine.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
Diffstat (limited to 'tests/auto/qgraphicsproxywidget')
| -rw-r--r-- | tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 1d0663a..f436551 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -3189,7 +3189,7 @@ void tst_QGraphicsProxyWidget::windowFlags() QVERIFY((widget->windowFlags() & widgetWFlags) == widgetWFlags); proxy.setWidget(widget); - + if (resultingProxyFlags == 0) QVERIFY(!proxy.windowFlags()); else |