diff options
author | Bea Lam <bea.lam@nokia.com> | 2012-08-01 10:14:34 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-02 05:44:58 +0200 |
commit | a0726b088b0b925db16d064cbfe1ce828911285c (patch) | |
tree | c2a9318cf7b0478cd3d6e132d35fbaa21a8bde73 | |
parent | 76c5bbd375fb41ab2a2226026b810f062614f687 (diff) |
Move QtQuick.Window module docs
Doesn't seem to get picked up by qdoc if the module docs reside
under quick/.
Change-Id: Ie27e85ee422d2259ffcb23d05ceb6fbbe7d22283
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
-rw-r--r-- | src/imports/window/plugin.cpp | 16 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 15 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/imports/window/plugin.cpp b/src/imports/window/plugin.cpp index b0c8c90890..fedaef2e1a 100644 --- a/src/imports/window/plugin.cpp +++ b/src/imports/window/plugin.cpp @@ -45,6 +45,22 @@ QT_BEGIN_NAMESPACE +/*! + \qmlmodule QtQuick.Window 2 + \title QML Module QtQuick.Window 2.0 + \brief Contains types for window management + + This QML module contains types for creating top-level windows and accessing screen information. + + To use the types in this module, import the module with the following line: + + \code + import QtQuick.Window 2.0 + \endcode +*/ + + + //![class decl] class QtQuick2WindowPlugin : public QQmlExtensionPlugin { diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 0924c24b7d..0a803c5aa6 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -774,21 +774,6 @@ void QQuickWindowPrivate::cleanup(QSGNode *n) q->maybeUpdate(); } - -/*! - \qmlmodule QtQuick.Window 2 - \title QML Module QtQuick.Window 2.0 - \brief Contains types for window management - - This QML module contains types for creating top-level windows and accessing screen information. - - To use the types in this module, import the module with the following line: - - \code - import QtQuick.Window 2.0 - \endcode -*/ - /*! \qmltype Window \instantiates QQuickWindow |