diff options
| author | axis <qt-info@nokia.com> | 2011-04-26 15:36:00 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-26 15:36:00 +0200 |
| commit | 1c09b529e4aa12cc31b70d07899eac1882710e80 (patch) | |
| tree | c051989127f627e6ed22593ca46efbe8d3f08a8c | |
| parent | d9c5d0d7b2bff9b8e8535f245541e446f94a4264 (diff) | |
| parent | 7b467dc8ac1d7bde5bde23995d6092928ce31118 (diff) | |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2
| -rw-r--r-- | src/declarative/scenegraph/qsgcontext.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/scenegraph/qsgcontext.cpp b/src/declarative/scenegraph/qsgcontext.cpp index b4a125c7b2..2a43d03028 100644 --- a/src/declarative/scenegraph/qsgcontext.cpp +++ b/src/declarative/scenegraph/qsgcontext.cpp @@ -118,10 +118,14 @@ public: /*! + \class QSGContext + \brief The QSGContext holds the scene graph entry points for one QML engine. The context is not ready for use until it has a QGLContext. Once that happens, the scene graph population can start. + + \internal */ QSGContext::QSGContext(QObject *parent) : |