Changeset 846 for trunk/src/gui/graphicsview/qgraphicsscene.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/graphicsview/qgraphicsscene.h (modified) (3 diffs)

trunk/src/gui/graphicsview/qgraphicsscene.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -303 +303 @@
     friend class QGraphicsItem;
     friend class QGraphicsItemPrivate;
+    friend class QGraphicsObject;
     friend class QGraphicsView;
     friend class QGraphicsViewPrivate;
@@ -313 +314 @@
     friend class QGraphicsSceneBspTreeIndexPrivate;
     friend class QGraphicsItemEffectSourcePrivate;
+#ifndef QT_NO_GESTURES
     friend class QGesture;
+#endif
 };