diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 03:43:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 03:43:47 (GMT) |
| commit | 1448e19b3613ab7c5498c17c619586d03ec46d18 (patch) | |
| tree | a6ce8079bf05a0692c3370c7fc88887711edd7a2 /src/gui/graphicsview/qgraphicsscene.h | |
| parent | 58c591974bf34577e27638f1328a04c4f7c698f8 (diff) | |
| parent | a039a3a53d0a07b04e3b30ba2a73150ea5d2522a (diff) | |
| download | Qt-1448e19b3613ab7c5498c17c619586d03ec46d18.zip Qt-1448e19b3613ab7c5498c17c619586d03ec46d18.tar.gz Qt-1448e19b3613ab7c5498c17c619586d03ec46d18.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_qgraphicsitem: stabilize on X11
Added OpenGL 3.3 and 4.0 recognition to QGLFormat
Fix compilation: disable -no-feature-* for bootstrapped
QString: Fix severals bugs when comparing with QStringRef
QProgressBar: make accessors const.
Changes: add patch for artificial emboldening
Added static version of QGLFramebufferObject::release().
Fix compilation on WinXP MinGW32;
Add a new qconfig feature GESTURES
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h index c34a303..f8615f4 100644 --- a/src/gui/graphicsview/qgraphicsscene.h +++ b/src/gui/graphicsview/qgraphicsscene.h @@ -313,7 +313,9 @@ private: friend class QGraphicsSceneBspTreeIndex; friend class QGraphicsSceneBspTreeIndexPrivate; friend class QGraphicsItemEffectSourcePrivate; +#ifndef QT_NO_GESTURES friend class QGesture; +#endif }; Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsScene::SceneLayers) |