summaryrefslogtreecommitdiffstats
path: root/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-06-11 12:06:41 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-06-11 12:06:41 (GMT)
commitd92d1106e8cb2ca14b26b8c027d52608ee2915e9 (patch)
tree91b75077ecf9fb4709f000b89d5963ab98cdfc9b /tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
parenta295a69e76ff330a2716c97b70723f0bd408f197 (diff)
parent24bcac9de46c89f4d8b533946e7b0feeacca1b0d (diff)
downloadQt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.zip
Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.tar.gz
Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp')
-rw-r--r--tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 5547b02..fe68c8e 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -7584,6 +7584,7 @@ void tst_QGraphicsItem::itemUsesExtendedStyleOption()
scene.addItem(rect);
rect->setPos(200, 200);
QGraphicsView view(&scene);
+ view.setWindowFlags(Qt::X11BypassWindowManagerHint);
rect->startTrack = false;
view.show();
QTest::qWaitForWindowShown(&view);