diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:21:52 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:23:09 +0100 |
| commit | 49651307807fc097d14ae13fb71013e46944eb2a (patch) | |
| tree | 3bc227a47f42c2edb7ff4b69fc183b4a99fe0bf3 /src/quick | |
| parent | 15b232bf694fedf553abac09af077a58ce571f9d (diff) | |
| parent | f4d4689d3c09cb4eae30be892be426d4fa185ed4 (diff) | |
Merge branch 'release' into stable
Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/doc/images/declarative-colors.png | bin | 0 -> 4993 bytes | |||
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 2 | ||||
| -rw-r--r-- | src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/doc/images/declarative-colors.png b/src/quick/doc/images/declarative-colors.png Binary files differnew file mode 100644 index 0000000000..f2eacd889b --- /dev/null +++ b/src/quick/doc/images/declarative-colors.png diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 96ee13bb51..6af5a1281c 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -20,7 +20,7 @@ qhp.QtQuick.customFilters.Qt.filterAttributes = qtquick 5.0.1 qhp.QtQuick.subprojects = qmltypes classes examples qhp.QtQuick.subprojects.qmltypes.title = QML Types qhp.QtQuick.subprojects.qmltypes.indexTitle = Qt Quick QML Types -qhp.QtQuick.subprojects.qmltypes.selectors = class fake:headerfile +qhp.QtQuick.subprojects.qmltypes.selectors = fake:qmlclass qhp.QtQuick.subprojects.qmltypes.sortPages = true qhp.QtQuick.subprojects.classes.title = Classes qhp.QtQuick.subprojects.classes.title = C++ Classes diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc index 724e94c5d7..e2753e47f4 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc @@ -178,6 +178,8 @@ created directly as elements within QML: \code class MyModelPlugin : public QQmlExtensionPlugin { + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.QmlExtension.MyModel" FILE "mymodel.json") public: void registerTypes(const char *uri) { @@ -185,8 +187,6 @@ public: "MyModel"); } } - -Q_EXPORT_PLUGIN2(mymodelplugin, MyModelPlugin); \endcode \li |
