diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 01:14:52 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 01:14:52 (GMT) |
| commit | 91a2da396fb476401e3b2c55ca7672a8b462ceca (patch) | |
| tree | dc944bf7d6df0fc0e2b0bad290396084626dd898 /src/gui/graphicsview | |
| parent | 530fd3831f012337d7460c4387ce82083ab3e144 (diff) | |
| parent | 5f92bc9dd9f05f4824711b03406bdbe222ff73e9 (diff) | |
| download | Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.zip Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.gz Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.bz2 | |
Merge branch '4.6' of ../qt into kinetic-declarativeui
Conflicts:
src/corelib/kernel/qobject.cpp
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 67dc898..2d34b80 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -589,6 +589,7 @@ public: return item->type() == QGraphicsPixmapItem::Type && !(item->flags() & QGraphicsItem::ItemIsSelectable) && item->d_ptr->children.size() == 0; + //|| (item->d_ptr->isObject && qobject_cast<QmlGraphicsImage *>(q_func())); } inline const QStyleOption *styleOption() const |