diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-04 10:41:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-04 10:41:55 +0200 |
| commit | 0d3592aa7fab8bf4d8f80bc3b35323efe6950b1b (patch) | |
| tree | 169707c4318185c418c8705628f03dd4118223e0 /src/qml/doc/src/cppintegration/data.qdoc | |
| parent | b9e3df1cceb337947c2c701975163b53dbe131d8 (diff) | |
| parent | 265b3bea18c1ac13da413931024f64f49a2da7fc (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1
Change-Id: I75b0099b2b9ebb5cfb6f07b43b90b598743ae033
Diffstat (limited to 'src/qml/doc/src/cppintegration/data.qdoc')
| -rw-r--r-- | src/qml/doc/src/cppintegration/data.qdoc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc index c748161ee8..54a556b783 100644 --- a/src/qml/doc/src/cppintegration/data.qdoc +++ b/src/qml/doc/src/cppintegration/data.qdoc @@ -174,7 +174,6 @@ function, passing a QVariantList and a QVariantMap, which are automatically converted to JavaScript array and object values, repectively: \table -\header \row \li QML \li \snippet qml/qtbinding/variantlistmap/MyItem.qml 0 @@ -213,7 +212,6 @@ a \c Date object that is automatically converted into a QDateTime value when it is received in C++: \table -\header \row \li QML \li |