summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsscene.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-10-21 13:26:06 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2009-10-29 16:00:11 (GMT)
commitfccbc9b94d843f4c55834ee75127cd6219b4839a (patch)
tree9c02c9429e8ad2140cf1567b74a4908834158199 /src/gui/graphicsview/qgraphicsscene.cpp
parentf73e3063649220f80b2d0ada3a7f087c32c0bfc8 (diff)
downloadQt-fccbc9b94d843f4c55834ee75127cd6219b4839a.zip
Qt-fccbc9b94d843f4c55834ee75127cd6219b4839a.tar.gz
Qt-fccbc9b94d843f4c55834ee75127cd6219b4839a.tar.bz2
Fix LIBRARY and ICON
However, compiling with QT_NO_ICON will still not work :( Reviewed-by: tom
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 c459d21..1e4fe6f 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -691,6 +691,7 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
focusItem = 0;
sendEvent(lastFocusItem, &event);
+#ifndef QT_NO_IM
if (lastFocusItem
&& (lastFocusItem->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
// Reset any visible preedit text
@@ -706,6 +707,7 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
views.at(i)->inputContext()->reset();
}
}
+#endif //QT_NO_IM
}
if (item) {