diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-12-07 23:39:04 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-12-10 14:12:22 +0000 |
| commit | 60cb95508c5dac036663dfcaa2c60e884b5dcad9 (patch) | |
| tree | 0f7b85bae6a4cbff71053f5613d682a8b6682736 | |
| parent | be3772725cec64e533d35a38376077363af01ede (diff) | |
Doc: Restore QtQuick.Shapes documentation
Sources for this module were recently moved. Add the new directory to
documentation config to make the documentation generate again.
Also, make the documented QML module version track the minor
version of Qt.
Change-Id: I56f439c141cbf39639a97d44d328c068fff6e96e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 9 | ||||
| -rw-r--r-- | src/quickshapes/qquickshape.cpp | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 8c69eba6a6..94bc80bf93 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -52,10 +52,11 @@ exampledirs += ../../../examples/quick \ imagedirs += images - -#add particles sources -headerdirs += ../../particles -sourcedirs += ../../particles +#add particles and shapes sources +headerdirs += ../../particles \ + ../../quickshapes +sourcedirs += ../../particles \ + ../../quickshapes #add imports directory because of dependencies headerdirs += ../../imports diff --git a/src/quickshapes/qquickshape.cpp b/src/quickshapes/qquickshape.cpp index 0c159ec21b..489d1c86f7 100644 --- a/src/quickshapes/qquickshape.cpp +++ b/src/quickshapes/qquickshape.cpp @@ -53,16 +53,16 @@ QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(QQSHAPE_LOG_TIME_DIRTY_SYNC, "qt.shape.time.sync") /*! - \qmlmodule QtQuick.Shapes 1.11 + \qmlmodule QtQuick.Shapes 1.\QtMinorVersion \title Qt Quick Shapes QML Types \ingroup qmlmodules \brief Provides QML types for drawing stroked and filled shapes. To use the types in this module, import the module with the following line: - \badcode - import QtQuick.Shapes 1.11 - \endcode + \qml \QtMinorVersion + import QtQuick.Shapes 1.\1 + \endqml */ QQuickShapeStrokeFillParams::QQuickShapeStrokeFillParams() |