diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 03:07:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 03:07:45 (GMT) |
| commit | 55664a0ef4b88b67c9931c7d2f6853e5fa0a9716 (patch) | |
| tree | cc5108dccff94c9adf6c5e194c604d224093e481 | |
| parent | 5ace2ec2a272091ba6dfb15274d387fb58bfa772 (diff) | |
| parent | cc9c08cad3648fd9525a0b7c3897ae22d5632c84 (diff) | |
| download | Qt-55664a0ef4b88b67c9931c7d2f6853e5fa0a9716.zip Qt-55664a0ef4b88b67c9931c7d2f6853e5fa0a9716.tar.gz Qt-55664a0ef4b88b67c9931c7d2f6853e5fa0a9716.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed compile with xlC.
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget_p.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp index 076e8626..28070da 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.cpp +++ b/src/gui/graphicsview/qgraphicswidget_p.cpp @@ -79,7 +79,8 @@ void QGraphicsWidgetPrivate::init(QGraphicsItem *parentItem, Qt::WindowFlags wFl resolveLayoutDirection(); q->unsetWindowFrameMargins(); - flags |= QGraphicsItem::ItemUsesExtendedStyleOption | QGraphicsItem::ItemSendsGeometryChanges; + flags |= QGraphicsItem::ItemUsesExtendedStyleOption; + flags |= QGraphicsItem::ItemSendsGeometryChanges; if (windowFlags & Qt::Window) flags |= QGraphicsItem::ItemIsPanel; } |