From 509a04338bc2b556c15f494a73947e82e3cdcc62 Mon Sep 17 00:00:00 2001
From: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Date: Wed, 29 Jul 2009 02:32:48 +0200
Subject: Disambiguate QGraphicsObject::children().

Add using to prefer QObject::children() over the obsolete
QGraphicsItem::children() function.

Reviewed-by: Henrik Hartz
---
 src/gui/graphicsview/qgraphicsitem.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index 945163f..b94fb97 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -514,6 +514,13 @@ class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem
 public:
     QGraphicsObject(QGraphicsItem *parent = 0);
 
+    // ### Qt 5: Disambiguate
+#ifdef Q_NO_USING_KEYWORD
+    const QObjectList &children() const { return QObject::children(); }
+#else
+    using QObject::children;
+#endif
+
 Q_SIGNALS:
     void parentChanged();
     void opacityChanged();
-- 
cgit v0.12