diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-04-07 13:04:31 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-15 10:36:20 (GMT) |
| commit | 8c8eac0a780c719f487c89009988d582c1db1112 (patch) | |
| tree | 9dd55c48db463aa2d46998e4042d7e07f5c2a3b8 | |
| parent | 9c7374464544aca8b005773223b7541a9cc9eea0 (diff) | |
| download | Qt-8c8eac0a780c719f487c89009988d582c1db1112.zip Qt-8c8eac0a780c719f487c89009988d582c1db1112.tar.gz Qt-8c8eac0a780c719f487c89009988d582c1db1112.tar.bz2 | |
BT: compilefix for Qt in namespace
RevBy: mauricek
Details: using prefix qt_ instead of ::global namespace
(cherry picked from commit 9904f77b26d3b75f8ed53e82c14ff8e9baf710dc)
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 0f5f50d..801ba99 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -3707,7 +3707,7 @@ void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly, bool maybeDirtyCl dirtyChildren = 1; } -static inline bool allChildrenCombineOpacity(QGraphicsItem *parent) +static inline bool qt_allChildrenCombineOpacity(QGraphicsItem *parent) { Q_ASSERT(parent); if (parent->flags() & QGraphicsItem::ItemDoesntPropagateOpacityToChildren) @@ -3726,11 +3726,11 @@ void QGraphicsItemPrivate::updateEffectiveOpacity() Q_Q(QGraphicsItem); if (parent) { resolveEffectiveOpacity(parent->effectiveOpacity()); - parent->d_ptr->allChildrenCombineOpacity = ::allChildrenCombineOpacity(parent); + parent->d_ptr->allChildrenCombineOpacity = qt_allChildrenCombineOpacity(parent); } else { resolveEffectiveOpacity(1.0); } - allChildrenCombineOpacity = ::allChildrenCombineOpacity(q); + allChildrenCombineOpacity = qt_allChildrenCombineOpacity(q); } /*! |