summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsscene.cpp
diff options
context:
space:
mode:
authorAriya Hidayat <ariya.hidayat@nokia.com>2009-06-05 15:41:58 (GMT)
committerAriya Hidayat <ariya.hidayat@nokia.com>2009-06-05 15:41:58 (GMT)
commite873cbdec9098856df2c2b584cee73ea0c5563ff (patch)
tree7d4bdc53f8c1b6da0c24772fe7908ce0271cf3a4 /src/gui/graphicsview/qgraphicsscene.cpp
parent7e53a66171ee3358abe4b022ce0fa721259fa604 (diff)
parent9691523b796c6acc6a837a5f5a34fef16aa74c48 (diff)
downloadQt-e873cbdec9098856df2c2b584cee73ea0c5563ff.zip
Qt-e873cbdec9098856df2c2b584cee73ea0c5563ff.tar.gz
Qt-e873cbdec9098856df2c2b584cee73ea0c5563ff.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-graphicseffect
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene.cpp')
-rw-r--r--src/gui/graphicsview/qgraphicsscene.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index bf8ca0a..fbe8364 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -2933,11 +2933,13 @@ void QGraphicsScene::addItem(QGraphicsItem *item)
d->allItemsIgnoreHoverEvents = false;
d->enableMouseTrackingOnViews();
}
+#ifndef QT_NO_CURSOR
if (d->allItemsUseDefaultCursor && item->hasCursor()) {
d->allItemsUseDefaultCursor = false;
if (d->allItemsIgnoreHoverEvents) // already enabled otherwise
d->enableMouseTrackingOnViews();
}
+#endif //QT_NO_CURSOR
// Update selection lists
if (item->isSelected())