diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-17 11:50:47 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-17 11:50:47 (GMT) |
| commit | 17d6f2a59fe2b170087cdf7074807c6a2dce1043 (patch) | |
| tree | 64af0faa3146cd516b9887c9344ebd03408bafcc /src/gui/graphicsview/qgraphicsscene_p.h | |
| parent | 103334ced3b0cb6e69a1ed3075d9b81e591f37e9 (diff) | |
| parent | 3d50220423b96a84f1ca4c0f5ef9246345aad359 (diff) | |
| download | Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.zip Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.tar.gz Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.tar.bz2 | |
Merge commit 'qt/master' into kinetic-graphicseffect
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index 64ee785..7beae20 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -131,7 +131,6 @@ public: QGraphicsWidget *activeWindow; int activationRefCount; void setFocusItemHelper(QGraphicsItem *item, Qt::FocusReason focusReason); - QMultiHash<QGraphicsItem *, QGraphicsItem *> focusProxyReverseMap; QList<QGraphicsWidget *> popupWidgets; void addPopup(QGraphicsWidget *widget); @@ -282,9 +281,9 @@ static inline void _q_adjustRect(QRectF *rect) { Q_ASSERT(rect); if (!rect->width()) - rect->adjust(-0.00001, 0, 0.00001, 0); + rect->adjust(qreal(-0.00001), 0, qreal(0.00001), 0); if (!rect->height()) - rect->adjust(0, -0.00001, 0, 0.00001); + rect->adjust(0, qreal(-0.00001), 0, qreal(0.00001)); } static inline QRectF adjustedItemBoundingRect(const QGraphicsItem *item) |