diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 12:03:20 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 12:03:20 (GMT) |
| commit | cf417f787454f131f35248bb0c1294dadd777b45 (patch) | |
| tree | e5ad2f54887aa695c6f66ae2c305ab75ccabdac0 /src/gui/graphicsview/qgraphicsanchorlayout_p.h | |
| parent | a7577f8c3ae3a025384d8d19fdf3575ef141a70b (diff) | |
| parent | e07878a9bcccbf063650272329c0aca14290b8e3 (diff) | |
| download | Qt-cf417f787454f131f35248bb0c1294dadd777b45.zip Qt-cf417f787454f131f35248bb0c1294dadd777b45.tar.gz Qt-cf417f787454f131f35248bb0c1294dadd777b45.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsanchorlayout_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsanchorlayout_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h index 3ef37f9..5f50c85 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h @@ -267,7 +267,7 @@ inline QString AnchorVertex::toString() const const AnchorVertexPair *vp = static_cast<const AnchorVertexPair *>(this); return QString::fromAscii("(%1, %2)").arg(vp->m_first->toString()).arg(vp->m_second->toString()); } else if (!m_item) { - return QString::fromAscii("NULL_%1").arg(int(this)); + return QString::fromAscii("NULL_%1").arg(quintptr(this)); } QString edge; switch (m_edge) { |