diff options
Diffstat (limited to 'src/quick/doc')
34 files changed, 494 insertions, 204 deletions
diff --git a/src/quick/doc/images/9BcAYDlpuT8.jpg b/src/quick/doc/images/9BcAYDlpuT8.jpg Binary files differnew file mode 100644 index 0000000000..0a69ab0034 --- /dev/null +++ b/src/quick/doc/images/9BcAYDlpuT8.jpg diff --git a/src/quick/doc/images/pointDistanceThreshold.png b/src/quick/doc/images/pointDistanceThreshold.png Binary files differdeleted file mode 100644 index c883f5f8a1..0000000000 --- a/src/quick/doc/images/pointDistanceThreshold.png +++ /dev/null diff --git a/src/quick/doc/images/pointerHandlerMargin.png b/src/quick/doc/images/pointerHandlerMargin.png Binary files differnew file mode 100644 index 0000000000..e996f57bf1 --- /dev/null +++ b/src/quick/doc/images/pointerHandlerMargin.png diff --git a/src/quick/doc/images/pointDistanceThreshold.svg b/src/quick/doc/images/pointerHandlerMargin.svg index 30d04e0df6..3e8b05f3f9 100644 --- a/src/quick/doc/images/pointDistanceThreshold.svg +++ b/src/quick/doc/images/pointerHandlerMargin.svg @@ -10,17 +10,17 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg6318" - inkscape:version="0.92.2 5c3e80d, 2017-08-06" - viewBox="0 0 249.99999 100" + inkscape:version="0.92.2 2405546, 2018-03-11" + viewBox="0 0 148.46917 100.37263" version="1.1" - sodipodi:docname="pointDistanceThreshold.svg" - width="250" - height="100" - inkscape:export-filename="/home/rutledge/dev/qt510/qtdeclarative/src/quick/doc/images/pointDistanceThreshold.png" + sodipodi:docname="pointerHandlerMargin.svg" + width="148.46918" + height="100.37263" + inkscape:export-filename="/home/rutledge/dev/qt5/qtdeclarative/src/quick/doc/images/pointerHandlerMargin.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96"> <title - id="title892">pointDistanceThreshold</title> + id="title892">pointerHandlerMargin</title> <defs id="defs20"> <marker @@ -104,18 +104,18 @@ id="base" bordercolor="#666666" inkscape:pageshadow="2" - inkscape:window-y="10" + inkscape:window-y="0" pagecolor="#ffffff" inkscape:zoom="2.1818696" - inkscape:window-width="3025" + inkscape:window-width="1920" inkscape:window-maximized="0" - inkscape:window-x="275" + inkscape:window-x="0" showgrid="false" borderopacity="1.0" inkscape:current-layer="layer1" - inkscape:cx="-180.21887" - inkscape:cy="-3.6626369" - inkscape:window-height="2115" + inkscape:cx="-22.660169" + inkscape:cy="58.210886" + inkscape:window-height="1080" inkscape:pageopacity="0.0" inkscape:document-units="px" fit-margin-top="0" @@ -126,7 +126,7 @@ id="layer1" inkscape:label="Camada 1" inkscape:groupmode="layer" - transform="translate(14.90473,-165.12199)"> + transform="translate(-86.411864,-164.74934)"> <rect style="opacity:1;fill:none;fill-opacity:1;stroke:#006eed;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4231" @@ -174,15 +174,15 @@ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker1145)" /> <text id="text1335" - y="227.02623" - x="-37.15416" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + y="226.88364" + x="104.81705" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" xml:space="preserve" transform="rotate(-6.0579549)"><tspan - y="227.02623" - x="-37.15416" - id="tspan1333" - sodipodi:role="line">pointDistanceThreshold</tspan></text> + y="226.88364" + x="104.81705" + sodipodi:role="line" + id="tspan862">margin</tspan></text> </g> <metadata id="metadata19"> @@ -196,10 +196,10 @@ <dc:publisher> <cc:Agent rdf:about="http://openclipart.org/"> - <dc:title></dc:title> + <dc:title /> </cc:Agent> </dc:publisher> - <dc:title>pointDistanceThreshold</dc:title> + <dc:title>pointerHandlerMargin</dc:title> <dc:creator> <cc:Agent> <dc:title>The Qt Company</dc:title> diff --git a/src/quick/doc/images/qml-item-canvas-lineDash.png b/src/quick/doc/images/qml-item-canvas-lineDash.png Binary files differnew file mode 100644 index 0000000000..a2a038abe0 --- /dev/null +++ b/src/quick/doc/images/qml-item-canvas-lineDash.png diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index ad5e47002d..34ec66bf1d 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -89,3 +89,7 @@ navigation.qmltypespage = "Qt Quick QML Types" # \svgcolor {#ffdead} macro.svgcolor.HTML = "<div style=\"padding:10px;color:#fff;background:\1;\"></div>" + +# youtube video thumbnails that show up in offline and online docs +HTML.extraimages += images/9BcAYDlpuT8.jpg +qhp.QtQuick.extraFiles += images/9BcAYDlpuT8.jpg diff --git a/src/quick/doc/snippets/pointerHandlers/dragHandler.qml b/src/quick/doc/snippets/pointerHandlers/dragHandler.qml index 78a7db5b0c..04ea3967a0 100644 --- a/src/quick/doc/snippets/pointerHandlers/dragHandler.qml +++ b/src/quick/doc/snippets/pointerHandlers/dragHandler.qml @@ -48,8 +48,7 @@ ** ****************************************************************************/ //![0] -import QtQuick 2.10 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Rectangle { width: 100 diff --git a/src/quick/doc/snippets/pointerHandlers/dragHandlerDifferentTarget.qml b/src/quick/doc/snippets/pointerHandlers/dragHandlerDifferentTarget.qml index 4c4168de83..7e7662539f 100644 --- a/src/quick/doc/snippets/pointerHandlers/dragHandlerDifferentTarget.qml +++ b/src/quick/doc/snippets/pointerHandlers/dragHandlerDifferentTarget.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -48,8 +48,7 @@ ** ****************************************************************************/ //![0] -import QtQuick 2.10 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Item { width: 640 @@ -58,8 +57,8 @@ Item { Rectangle { id: feedback border.color: "red" - width: Math.max(10, handler.point.ellipseDiameters.width) - height: Math.max(10, handler.point.ellipseDiameters.height) + width: Math.max(10, handler.centroid.ellipseDiameters.width) + height: Math.max(10, handler.centroid.ellipseDiameters.height) radius: Math.max(width, height) / 2 visible: handler.active } diff --git a/src/quick/doc/snippets/pointerHandlers/dragHandlerNullTarget.qml b/src/quick/doc/snippets/pointerHandlers/dragHandlerNullTarget.qml index 09429ec1d2..c33f2b2782 100644 --- a/src/quick/doc/snippets/pointerHandlers/dragHandlerNullTarget.qml +++ b/src/quick/doc/snippets/pointerHandlers/dragHandlerNullTarget.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -48,8 +48,7 @@ ** ****************************************************************************/ //![0] -import QtQuick 2.10 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Item { width: 640 @@ -62,9 +61,9 @@ Item { Text { color: handler.active ? "darkgreen" : "black" - text: handler.point.position.x.toFixed(1) + "," + handler.point.position.y.toFixed(1) - x: handler.point.position.x - width / 2 - y: handler.point.position.y - height + text: handler.centroid.centroid.x.toFixed(1) + "," + handler.centroid.position.y.toFixed(1) + x: handler.centroid.position.x - width / 2 + y: handler.centroid.position.y - height } } //![0] diff --git a/src/quick/doc/snippets/pointerHandlers/pinchHandler.qml b/src/quick/doc/snippets/pointerHandlers/pinchHandler.qml index 955047d115..dd0542a953 100644 --- a/src/quick/doc/snippets/pointerHandlers/pinchHandler.qml +++ b/src/quick/doc/snippets/pointerHandlers/pinchHandler.qml @@ -48,8 +48,7 @@ ** ****************************************************************************/ //![0] -import QtQuick 2.8 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Rectangle { width: 400 diff --git a/src/quick/doc/snippets/pointerHandlers/pinchHandlerDifferentTarget.qml b/src/quick/doc/snippets/pointerHandlers/pinchHandlerDifferentTarget.qml index a5255a64e3..b071e294af 100644 --- a/src/quick/doc/snippets/pointerHandlers/pinchHandlerDifferentTarget.qml +++ b/src/quick/doc/snippets/pointerHandlers/pinchHandlerDifferentTarget.qml @@ -48,8 +48,7 @@ ** ****************************************************************************/ //![0] -import QtQuick 2.8 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Item { width: 640 diff --git a/src/quick/doc/snippets/pointerHandlers/pinchHandlerNullTarget.qml b/src/quick/doc/snippets/pointerHandlers/pinchHandlerNullTarget.qml index 7d21efcb84..ade59d29f0 100644 --- a/src/quick/doc/snippets/pointerHandlers/pinchHandlerNullTarget.qml +++ b/src/quick/doc/snippets/pointerHandlers/pinchHandlerNullTarget.qml @@ -48,8 +48,7 @@ ** ****************************************************************************/ //![0] -import QtQuick 2.8 -import Qt.labs.handlers 1.0 +import QtQuick 2.12 Item { width: 640 diff --git a/src/quick/doc/snippets/pointerHandlers/pointHandler.qml b/src/quick/doc/snippets/pointerHandlers/pointHandler.qml index 262eb607b6..20be120120 100644 --- a/src/quick/doc/snippets/pointerHandlers/pointHandler.qml +++ b/src/quick/doc/snippets/pointerHandlers/pointHandler.qml @@ -48,9 +48,8 @@ ** ****************************************************************************/ //![0] -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Window 2.2 -import Qt.labs.handlers 1.0 Window { width: 480 diff --git a/src/quick/doc/snippets/qml/mousearea/mousearea-snippet.qml b/src/quick/doc/snippets/qml/mousearea/mousearea-snippet.qml index 0306c2de0f..13ef779d08 100644 --- a/src/quick/doc/snippets/qml/mousearea/mousearea-snippet.qml +++ b/src/quick/doc/snippets/qml/mousearea/mousearea-snippet.qml @@ -90,7 +90,7 @@ Rectangle { Rectangle { width: 100; height: 100 - //! [mouse handlers] + //! [signal handlers] MouseArea { anchors.fill: parent onClicked: console.log("area clicked") @@ -98,7 +98,7 @@ Rectangle { onEntered: console.log("mouse entered the area") onExited: console.log("mouse left the area") } - //! [mouse handlers] + //! [signal handlers] } } //end of column diff --git a/src/quick/doc/snippets/qml/pathview/pathview.qml b/src/quick/doc/snippets/qml/pathview/pathview.qml index 1a31f1372b..58d19b1a0c 100644 --- a/src/quick/doc/snippets/qml/pathview/pathview.qml +++ b/src/quick/doc/snippets/qml/pathview/pathview.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -59,6 +59,7 @@ Rectangle { id: delegate Column { id: wrapper + opacity: PathView.isCurrentItem ? 1 : 0.5 Image { anchors.horizontalCenter: nameText.horizontalCenter width: 64; height: 64 @@ -68,7 +69,6 @@ Rectangle { id: nameText text: name font.pointSize: 16 - color: wrapper.PathView.isCurrentItem ? "red" : "black" } } } diff --git a/src/quick/doc/snippets/qml/rectangle/rectangle-gradient.qml b/src/quick/doc/snippets/qml/rectangle/rectangle-gradient.qml index 031bee960d..e52a0ce0ef 100644 --- a/src/quick/doc/snippets/qml/rectangle/rectangle-gradient.qml +++ b/src/quick/doc/snippets/qml/rectangle/rectangle-gradient.qml @@ -80,5 +80,17 @@ Rectangle { } } //! [rectangles] + +//! [presets] +Rectangle { + y: 0; width: 80; height: 80 + gradient: Gradient.NightFade +} + +Rectangle { + y: 0; width: 80; height: 80 + gradient: "NightFade" +} +//! [presets] } } diff --git a/src/quick/doc/snippets/qml/tableview/reusabledelegate.qml b/src/quick/doc/snippets/qml/tableview/reusabledelegate.qml new file mode 100644 index 0000000000..4a49e809cc --- /dev/null +++ b/src/quick/doc/snippets/qml/tableview/reusabledelegate.qml @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.12 + +//![0] +Component { + id: tableViewDelegate + Rectangle { + implicitWidth: 100 + implicitHeight: 50 + + TableView.onPooled: rotationAnimation.pause() + TableView.onReused: rotationAnimation.resume() + + Rectangle { + id: rect + anchors.centerIn: parent + width: 40 + height: 5 + color: "green" + + RotationAnimation { + id: rotationAnimation + target: rect + duration: (Math.random() * 2000) + 200 + from: 0 + to: 359 + running: true + loops: Animation.Infinite + } + } + } +} +//![0] diff --git a/src/quick/doc/snippets/qml/tableview/tablemodel.cpp b/src/quick/doc/snippets/qml/tableview/tablemodel.cpp new file mode 100644 index 0000000000..ea9f76f131 --- /dev/null +++ b/src/quick/doc/snippets/qml/tableview/tablemodel.cpp @@ -0,0 +1,103 @@ +/**************************************************************************** + ** + ** Copyright (C) 2018 The Qt Company Ltd. + ** Contact: https://www.qt.io/licensing/ + ** + ** This file is part of the documentation of the Qt Toolkit. + ** + ** $QT_BEGIN_LICENSE:BSD$ + ** Commercial License Usage + ** Licensees holding valid commercial Qt licenses may use this file in + ** accordance with the commercial license agreement provided with the + ** Software or, alternatively, in accordance with the terms contained in + ** a written agreement between you and The Qt Company. For licensing terms + ** and conditions see https://www.qt.io/terms-conditions. For further + ** information use the contact form at https://www.qt.io/contact-us. + ** + ** BSD License Usage + ** Alternatively, you may use this file under the terms of the BSD license + ** as follows: + ** + ** "Redistribution and use in source and binary forms, with or without + ** modification, are permitted provided that the following conditions are + ** met: + ** * Redistributions of source code must retain the above copyright + ** notice, this list of conditions and the following disclaimer. + ** * Redistributions in binary form must reproduce the above copyright + ** notice, this list of conditions and the following disclaimer in + ** the documentation and/or other materials provided with the + ** distribution. + ** * Neither the name of The Qt Company Ltd nor the names of its + ** contributors may be used to endorse or promote products derived + ** from this software without specific prior written permission. + ** + ** + ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + ** + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ + +//![0] +#include <QGuiApplication> +#include <QQmlApplicationEngine> +#include <QAbstractTableModel> + +class TableModel : public QAbstractTableModel +{ + Q_OBJECT + +public: + + int rowCount(const QModelIndex & = QModelIndex()) const override + { + return 200; + } + + int columnCount(const QModelIndex & = QModelIndex()) const override + { + return 200; + } + + QVariant data(const QModelIndex &index, int role) const override + { + switch (role) { + case Qt::DisplayRole: + return QString("%1, %2").arg(index.column()).arg(index.row()); + default: + break; + } + + return QVariant(); + } + + QHash<int, QByteArray> roleNames() const override + { + return { {Qt::DisplayRole, "display"} }; + } +}; + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + + qmlRegisterType<TableModel>("TableModel", 0, 1, "TableModel"); + + QQmlApplicationEngine engine; + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + + return app.exec(); +} + +#include "main.moc" +//![0] diff --git a/src/quick/doc/snippets/qml/models/visual-model-and-view.qml b/src/quick/doc/snippets/qml/tableview/tablemodel.qml index baf489f8b9..8a8ec94958 100644 --- a/src/quick/doc/snippets/qml/models/visual-model-and-view.qml +++ b/src/quick/doc/snippets/qml/tableview/tablemodel.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -47,22 +47,25 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 -Rectangle { - width: 200; height: 200 +//![0] +import QtQuick 2.12 +import TableModel 0.1 - //! [visual model and view] - VisualItemModel { - id: itemModel - Rectangle { height: 30; width: 80; color: "red" } - Rectangle { height: 30; width: 80; color: "green" } - Rectangle { height: 30; width: 80; color: "blue" } - } +TableView { + anchors.fill: parent + columnSpacing: 1 + rowSpacing: 1 + clip: true + + model: TableModel {} - ListView { - anchors.fill: parent - model: itemModel + delegate: Rectangle { + implicitWidth: 100 + implicitHeight: 50 + Text { + text: display + } } - //! [visual model and view] } +//![0] diff --git a/src/quick/doc/snippets/qml/tableview/tableviewwithheader.qml b/src/quick/doc/snippets/qml/tableview/tableviewwithheader.qml new file mode 100644 index 0000000000..2214328ee7 --- /dev/null +++ b/src/quick/doc/snippets/qml/tableview/tableviewwithheader.qml @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.12 + +//![0] +TableView { + id: tableView + + topMargin: header.implicitHeight + + Text { + id: header + text: "A table header" + } +} +//![0] diff --git a/src/quick/doc/snippets/qml/tableview/tableviewwithprovider.qml b/src/quick/doc/snippets/qml/tableview/tableviewwithprovider.qml new file mode 100644 index 0000000000..028b12ca6c --- /dev/null +++ b/src/quick/doc/snippets/qml/tableview/tableviewwithprovider.qml @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.12 + +//![0] +TableView { + id: tableView + + property var columnWidths: [100, 50, 80, 150] + columnWidthProvider: function (column) { return columnWidths[column] } + + Timer { + running: true + interval: 2000 + onTriggered: { + tableView.columnWidths[2] = 150 + tableView.forceLayout(); + } + } +} +//![0] diff --git a/src/quick/doc/snippets/qml/transition-reversible.qml b/src/quick/doc/snippets/qml/transition-reversible.qml index 58a88621c4..f74b6bffb3 100644 --- a/src/quick/doc/snippets/qml/transition-reversible.qml +++ b/src/quick/doc/snippets/qml/transition-reversible.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -47,24 +47,26 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 //![0] Rectangle { id: rect width: 100; height: 100 - color: "red" + color: "steelblue" - MouseArea { id: mouseArea; anchors.fill: parent } + TapHandler { id: tapHandler } states: State { name: "brighter" - when: mouseArea.pressed - PropertyChanges { target: rect; color: "yellow"; x: 50 } + when: tapHandler.pressed + PropertyChanges { target: rect; color: "lightsteelblue"; x: 50 } } //! [sequential animations] transitions: Transition { + to: "brighter" + reversible: true SequentialAnimation { PropertyAnimation { property: "x"; duration: 1000 } ColorAnimation { duration: 1000 } diff --git a/src/quick/doc/src/concepts/effects/particles.qdoc b/src/quick/doc/src/concepts/effects/particles.qdoc index 59f9c0db83..0b87eb4529 100644 --- a/src/quick/doc/src/concepts/effects/particles.qdoc +++ b/src/quick/doc/src/concepts/effects/particles.qdoc @@ -26,15 +26,16 @@ ****************************************************************************/ /*! - \qmlmodule QtQuick.Particles 2.11 + \qmlmodule QtQuick.Particles 2.\QtMinorVersion \title Qt Quick Particles QML Types \ingroup qmlmodules \brief Provides QML types for particle effects This QML module contains a particle system for Qt Quick. To use these types, import the module with the following line: - \code - import QtQuick.Particles 2.11 - \endcode + + \qml \QtMinorVersion + import QtQuick.Particles 2.\1 + \endqml For a simple overview of how the system can be used, see \l{Using the Qt Quick Particle System}. @@ -48,10 +49,11 @@ Documentation for all Particle System types can be found on the \l QtQuick.Particles module page. - Note that to use types from the particles module, you will need to import the types with the following line: - \code - import QtQuick.Particles 2.11 - \endcode + To use the types from the particles module, import the module with the following line: + + \qml \QtMinorVersion + import QtQuick.Particles 2.\1 + \endqml \section1 The ParticleSystem This particle system contains four main types of QML types: ParticleSystem, Painters, Emitters and Affectors. diff --git a/src/quick/doc/src/concepts/input/mouse.qdoc b/src/quick/doc/src/concepts/input/mouse.qdoc index 422c326898..cb506cb99a 100644 --- a/src/quick/doc/src/concepts/input/mouse.qdoc +++ b/src/quick/doc/src/concepts/input/mouse.qdoc @@ -33,6 +33,13 @@ \tableofcontents +A more modern way of handling events from all pointing devices, including +mouse and touchscreen, is via \l {Qt Quick Input Handlers}{Input Handlers}. +This page describes the original Qt Quick \l MouseArea type, which was +initially designed to handle mouse input, and later began handling single-touch +events (in the form of synthetic mouse events) in simple touch-oriented user +interfaces. + \section1 Mouse Types \list @@ -44,8 +51,8 @@ QML uses \l{qtqml-syntax-signals.html}{signals and handlers} to deliver mouse interactions. Specifically, Qt Quick provides the \l MouseArea -and \l MouseEvent types which allow developers to define signal handlers which -accept mouse events within a defined area. +and \l MouseEvent types that allow developers to define JavaScript callbacks +(also called signal handlers), which accept mouse events within a defined area. \section1 Defining a Mouse Area @@ -59,8 +66,8 @@ definable. \section1 Receiving Events -The MouseArea type provides -\l{qtqml-syntax-signals.html}{signals and handlers} to detect different +The MouseArea type emits +\l{qtqml-syntax-signals.html}{signals} in response to different mouse events. The \l MouseArea type documentation describes these gestures in greater detail: @@ -76,8 +83,8 @@ gestures in greater detail: \li released \endlist -These signals have signal handlers that are invoked when the signals are emitted. -\snippet qml/mousearea/mousearea-snippet.qml mouse handlers +These signals can have callbacks that are invoked when the signals are emitted. +\snippet qml/mousearea/mousearea-snippet.qml signal handlers \section1 Enabling Gestures Some mouse gestures and button clicks need to be enabled before they send or @@ -101,9 +108,9 @@ Additionally, to disable the whole mouse area, set the MouseArea \section1 MouseEvent Object -Signals and their handlers receive a \l MouseEvent object as a parameter. The -\c mouse object contain information about the mouse event. For example, the -mouse button that started the event is queried through the +Signals and their callbacks receive a \l MouseEvent object as a parameter. +The \c mouse object contains information about the mouse event. For example, +the mouse button that started the event is queried through the \l {MouseEvent::button}{mouse.button} property. The \c MouseEvent object can also ignore a mouse event using its \c accepted diff --git a/src/quick/doc/src/concepts/input/topic.qdoc b/src/quick/doc/src/concepts/input/topic.qdoc index c23654cadb..95f4732f46 100644 --- a/src/quick/doc/src/concepts/input/topic.qdoc +++ b/src/quick/doc/src/concepts/input/topic.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -35,30 +35,20 @@ design. Depending on the use-case that an application solves, and the form-factor of the device that the application runs on, the best way to receive user-input may be different. -\section1 Touch +\section1 Input from Pointing Devices Allowing users to physically touch a screen to interact with an application is a popular user-interface paradigm on portable devices like smartphones and -tablets. +tablets. In desktop applications, detecting and reacting to clicks and presses +according to the mouse cursor position is a fundamental concept in +user-interface design. -Qt Quick was designed specifically with touch-driven user-interfaces in mind, -and thus touch events are supported in various visual object types, from -\l{Flickable} lists to the generic \l{MultiPointTouchArea} type, as well as -in the \l{MouseArea} type (which will be documented thoroughly in a proceeding -section). +Touch-driven and mouse-driven user interfaces are supported by various +\l{Qt Quick Input Handlers}{input handler} types, and visual object types +such as \l{Flickable} and \l{MouseArea}. - -\section1 Mouse - -Mouse input is another important user input for user interfaces. Detecting -and reacting to clicks and presses according to the mouse cursor position is a fundamental -concept in user-interface design. - -Qt Quick provides the MouseArea visual object type which automatically receives -mouse events (including clicks and wheel events) which allows developers to -create custom user-interface objects to handle mouse input. Please see the -documentation about \l{qtquick-input-mouseevents.html} -{mouse events in Qt Quick} for more information on the topic. +See also the documentation about +\l{qtquick-input-mouseevents.html} {mouse events in Qt Quick}. \section1 Keyboard Input and Keyboard Focus diff --git a/src/quick/doc/src/concepts/pointerhandlers/qtquickhandlers-index.qdoc b/src/quick/doc/src/concepts/inputhandlers/qtquickhandlers-index.qdoc index fc1fd5fbc1..2ac9860e6f 100644 --- a/src/quick/doc/src/concepts/pointerhandlers/qtquickhandlers-index.qdoc +++ b/src/quick/doc/src/concepts/inputhandlers/qtquickhandlers-index.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -27,35 +27,34 @@ /*! \page qtquickhandlers-index.html - \title Qt Quick Pointer Handlers - \brief A module with a set of QML elements that handle events from pointing devices in a user interface. + \title Qt Quick Input Handlers + \brief A module with a set of QML elements that handle events from input devices in a user interface. - Qt Quick Pointer Handlers are a set of QML types used to handle events from - touch, mouse, and stylus devices in a UI. In contrast to event-handling - Items, such as \l MouseArea, Pointer Handlers require less memory and are - intended to be used in greater numbers: one handler per type of - interaction. Each Pointer Handler handles events on behalf of its \c parent - Item. One Item can have multiple Pointer Handlers. + Qt Quick Input Handlers are a set of QML types used to handle events from + keyboard, touch, mouse, and stylus devices in a UI. In contrast to event-handling + items, such as \l MouseArea and \l Flickable, input handlers are explicitly non-visual, + require less memory and are intended to be used in greater numbers: one + handler instance per aspect of interaction. Each input handler instance + handles certain events on behalf of its \c parent Item. Thus the visual and + behavioral concerns are better separated, and the behavior is built up by + finer-grained composition. - The module is introduced in Qt 5.10. + In Qt 5.10, these handlers were introduced in a separate Qt.labs.handlers module. + Now they are included with Qt Quick since 5.12. The pre-existing + \l Keys attached property is similar in concept, so we refer to the + pointing-device-oriented handlers plus \c Keys together as the set of Input Handlers. + We expect to offer more attached-property use cases in future versions of Qt. - \section1 Pointer Handlers + \section1 Input Handlers - \annotatedlist pointerhandlers - - \section1 Getting Started - - The QML types can be imported into your application using the following import statement in your \c {.qml} file. - - \code - import Qt.labs.handlers 1.0 - \endcode + \annotatedlist qtquick-input-handlers \section1 Key Features Some of the key features are: \list + \li Handle keystrokes within the focused Item \li Handle gestures such as tapping or dragging regardless which device it comes from \li Handle gestures from different classes of devices in different ways \li Each Item can have unlimited Handlers @@ -67,7 +66,5 @@ \list \li \l{Qt Quick} - \li \l{Qt Quick Pointer Handlers} - \li \l{Qt Quick Pointer Handlers QML Types}{Qt Quick Pointer Handlers QML Types} \endlist */ diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc index d82e35fb93..c33fc0cfa3 100644 --- a/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc +++ b/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule QtQuick.Layouts 1.11 + \qmlmodule QtQuick.Layouts 1.\QtMinorVersion \title Qt Quick Layouts QML Types \ingroup qmlmodules \brief Provides QML types for arranging QML items in a user interface. @@ -39,8 +39,8 @@ The QML types can be imported into your application using the following import statement in your .qml file. - \code - import QtQuick.Layouts 1.11 - \endcode + \qml \QtMinorVersion + import QtQuick.Layouts 1.\1 + \endqml */ diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc index 2705ca5e34..e8265b92d2 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc @@ -41,9 +41,10 @@ QObjectList or a \l QAbstractItemModel. The first three are useful for exposing simpler datasets, while QAbstractItemModel provides a more flexible solution for more complex models. -For a video tutorial that takes you through the whole process of exposing a C++ -model to QML, see the -\l {https://youtu.be/9BcAYDlpuT8}{Using C++ Models in QML Tutorial}. +Here is a video tutorial that takes you through the whole process of exposing a C++ +model to QML: + +\youtube 9BcAYDlpuT8 \section2 QStringList-based Model diff --git a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc index 86beb38e6a..89b7929755 100644 --- a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc +++ b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc @@ -278,11 +278,6 @@ To visualize data, bind the view's \c model property to a model and the } \endcode - \note VisualItemModel can also be used, but it is only provided for compatibility - reasons. VisualItemModel allows a QML item to be provided as a model. This model - contains both the data and delegate; the child items of a VisualItemModel - provide the contents of the delegate. The model does not provide any roles. - \section2 Integers as Models An integer can be used as a model that contains a certain number @@ -307,6 +302,7 @@ To visualize data, bind the view's \c model property to a model and the } \endqml + \note The limit on the number of items in an integer model is 100,000,000. \section2 Object Instances as Models diff --git a/src/quick/doc/src/concepts/pointerhandlers/qtquickhandlers.qdoc b/src/quick/doc/src/concepts/pointerhandlers/qtquickhandlers.qdoc deleted file mode 100644 index cf87c75e8c..0000000000 --- a/src/quick/doc/src/concepts/pointerhandlers/qtquickhandlers.qdoc +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \qmlmodule Qt.labs.handlers 1.0 - \title Qt Quick Pointer Handlers QML Types - \ingroup qmlmodules - \brief Provides QML types for handling events from pointing devices in a user interface. - - The \l{Qt Quick Pointer Handlers} module provides QML types for handling - events from pointing devices in a UI. These QML types work in conjunction - with \l{Qt Quick}. - - The QML types can be imported into your application using the - following import statement in your .qml file. - - \code - import Qt.labs.handlers 1.0 - \endcode -*/ diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc index 4e1eca7ac3..7c8cd735b3 100644 --- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc +++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc @@ -73,7 +73,7 @@ the effective alignment of the text element that takes the mirroring into accoun (This applies to the \l Row, \l Grid, \l Flow, \l ListView and \l GridView types.) -From Qt Quick 1.1 onwards, types used for horizontal positioning and model views have gained a \c layoutDirection +Types used for horizontal positioning and model views have the \c layoutDirection property for controlling the horizontal direction of the layouts. Setting \c layoutDirection to \c Qt.RightToLeft causes items to be laid out from the right to left. By default Qt Quick follows the left-to-right layout direction. @@ -132,7 +132,7 @@ aligned and just make sure that text is translated and aligned properly. (This applies to \l Image, \l BorderImage and \l AnimatedImage types.) Most images do not need to be mirrored, but some directional icons, such as arrows, may need to be mirrored. -The painting of these icons can be mirrored with a dedicated \c mirror property introduced in Qt Quick 1.1: +The painting of these icons can be mirrored with a dedicated \c mirror property: \snippet qml/righttoleft.qml 5 diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc index 99175ab94e..4c94259139 100644 --- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc +++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc @@ -796,6 +796,14 @@ with multiple windows. \li Mipmapped Image items are not placed in the global atlas and will not be batched. + \li A bug in the OpenGL driver related to framebuffer object (FBO) readbacks + may corrupt rendered glyphs. If you set the \c QML_USE_GLYPHCACHE_WORKAROUND + environment variable, Qt keeps an additional copy of the glyph in RAM. This + means that performance is slightly lower when drawing glyphs that have not + been drawn before, as Qt accesses the extra copy via the CPU. It also means + that the glyph cache will use twice as much memory. The quality is not + affected by this. + \endlist If an application performs poorly, make sure that rendering is diff --git a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc index c8bdfa28cd..dd7f21e81a 100644 --- a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc +++ b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc @@ -28,7 +28,7 @@ /*! \page qtquick-bestpractices.html \title Best Practices for QML and Qt Quick -\brief Lists best practices for working with QML and Qt Quick +\brief Lists best practices for working with QML and Qt Quick. \ingroup best-practices Despite all of the benefits that QML and Qt Quick offer, they can be @@ -121,7 +121,7 @@ of resources. However, whenever a new file is added to \c RESOURCES using this approach, it causes \e all of the other files in \c RESOURCES to be recompiled as well. This can be inefficient, especially for large sets of files. In this case, a better approach is to separate each type of resource into its -own \l {Resource Collection Files (.qrc)}{.qrc} file. For example, the snippet +own \l [Qt Core] {Resource Collection Files}{.qrc} file. For example, the snippet above could be changed to the following: \badcode @@ -197,9 +197,9 @@ so. To explain why, let's take a look at a simplified example. Suppose we were writing the UI for a settings page: -\qml - import QtQuick 2.11 - import QtQuick.Controls 2.4 +\qml \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 Page { Button { @@ -296,9 +296,9 @@ into QML: The QML then calls the C++ slot directly: -\qml - import QtQuick 2.11 - import QtQuick.Controls 2.4 +\qml \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 Page { Button { diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index e787ed31ef..ddf90f88d9 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! -\qmlmodule QtQuick 2.11 +\qmlmodule QtQuick 2.\QtMinorVersion \title Qt Quick QML Types \ingroup qmlmodules \brief Provides graphical QML types. @@ -34,11 +34,11 @@ The \l{Qt Quick} module provides graphical primitive types. These types are only available in a QML document if that document imports the \c QtQuick namespace. -The current version of the \c QtQuick module is version 2.11, and thus it may be -imported via the following statement: +The current version of the \c QtQuick module is version \QtMinorVersion, and +thus it may be imported via the following statement: -\qml -import QtQuick 2.11 +\qml \QtMinorVersion +import QtQuick 2.\1 \endqml Visit the \l {Qt Quick} module documentation for more @@ -78,7 +78,7 @@ In addition, the \c QtQuick import provides the following basic types: \section1 Object Types -All object types provided by the \c QtQuick import are based on the \l{Item} +Most object types provided by the \c QtQuick import are based on the \l{Item} type, which itself derives from \l{QtQml::QtObject}{QtObject}. \l{Qt QML QML Types#Object Types} {QML object types} provided by the Qt QML module (such as \l{QtQml::QtObject}{QtObject} and \l{QtQml::Component}{Component}) are also @@ -889,15 +889,16 @@ console.log(c + " " + d); // false true */ /*! -\qmlmodule QtTest 1.11 +\qmlmodule QtTest 1.\QtMinorVersion \title Qt Quick Test QML Types \brief This module provides QML types to unit test your QML application \ingroup qmlmodules You can import this module using the following statement: -\code -import QtTest 1.11 -\endcode + +\qml \QtMinorVersion +import QtTest 1.\1 +\endqml For more information about how to use these types, see \l{Qt Quick Test}. |
