From 785451a30921f11a88d45c1f9e1a00f6c7e571d8 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Fri, 20 Jul 2018 20:20:10 +0200 Subject: Doc: Add precision to scene graph description Task-number: QTBUG-60913 Change-Id: I3a9d8925337a12a849e39a70f168dbfc7f007e5f Reviewed-by: Mitch Curtis --- src/quick/items/qquickitem.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 29b0ed10e6..e568a27ed7 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -1816,10 +1816,10 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus) \section1 Custom Scene Graph Items - All visual QML items are rendered using the scene graph, a - low-level, high-performance rendering stack, closely tied to - OpenGL. It is possible for subclasses of QQuickItem to add their - own custom content into the scene graph by setting the + All visual QML items are rendered using the scene graph, the default + implementation of which is a low-level, high-performance rendering stack, + closely tied to OpenGL. It is possible for subclasses of QQuickItem to add + their own custom content into the scene graph by setting the QQuickItem::ItemHasContents flag and reimplementing the QQuickItem::updatePaintNode() function. -- cgit v1.2.3 From 9ee7b52f3234d12c7617ddf716f54e1923d3cded Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 16 Jul 2018 15:35:47 +0200 Subject: Doc: Extend ItemSelectionModel QML documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change provides a bare minimum documentation for the ItemSelectionModel QML type. Task-number: QTBUG-58090 Change-Id: I0e232f8e05e7629d6f573f8dce21154d0ec307e5 Reviewed-by: Topi Reiniö --- src/qml/types/qqmlitemselectionmodel.qdoc | 63 +++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/qml/types/qqmlitemselectionmodel.qdoc b/src/qml/types/qqmlitemselectionmodel.qdoc index 64c0429acd..7ddfd79217 100644 --- a/src/qml/types/qqmlitemselectionmodel.qdoc +++ b/src/qml/types/qqmlitemselectionmodel.qdoc @@ -35,9 +35,6 @@ \brief Instantiates a QItemSelectionModel to be used in conjunction with a QAbstractItemModel and any view supporting it. - This page only enumerates the properties, methods, and signals available in QML. - See \l QItemSelectionModel for the actual documentation of this class. - \sa QItemSelectionModel, {Models and Views in Qt Quick} */ @@ -76,34 +73,67 @@ /*! \qmlmethod bool ItemSelectionModel::isSelected(QModelIndex index) + + Returns \c true if the given model item \a index is selected. */ /*! \qmlmethod bool ItemSelectionModel::isRowSelected(int row, QModelIndex parent) + + Returns \c true if all items are selected in the \a row with the given + \a parent. + + Note that this function is usually faster than calling isSelected() + on all items in the same row, and that unselectable items are ignored. */ /*! \qmlmethod bool ItemSelectionModel::isColumnSelected(int column, QModelIndex parent) + + Returns \c true if all items are selected in the \a column with the given + \a parent. + + Note that this function is usually faster than calling isSelected() + on all items in the same column, and that unselectable items are ignored. */ /*! \qmlmethod bool ItemSelectionModel::rowIntersectsSelection(int row, QModelIndex parent) + + Returns \c true if there are any items selected in the \a row with the + given \a parent. */ /*! \qmlmethod bool ItemSelectionModel::columnIntersectsSelection(int column, QModelIndex parent) + + Returns \c true if there are any items selected in the \a column with the + given \a parent. */ /*! \qmlmethod QModelIndexList ItemSelectionModel::selectedRows(int column) + + Returns the indexes in the given \a column for the rows where all columns + are selected. + + \sa selectedColumns() */ /*! \qmlmethod QModelIndexList ItemSelectionModel::selectedColumns(int row) + + Returns the indexes in the given \a row for columns where all rows are + selected. + + \sa selectedRows() */ /*! - \qmlmethod QItemSelection ItemSelectionModel::selection() + \qmlproperty object ItemSelectionModel::selection + \readonly + + Holds the selection ranges stored in the selection model. */ /*! @@ -161,24 +191,49 @@ /*! \qmlmethod void ItemSelectionModel::clear() + + Clears the selection model. Emits selectionChanged() and currentChanged(). */ /*! \qmlmethod void ItemSelectionModel::reset() + + Clears the selection model. Does not emit any signals. */ /*! \qmlmethod void ItemSelectionModel::clearSelection() + + Clears the selection in the selection model. Emits selectionChanged(). */ /*! \qmlmethod void ItemSelectionModel::clearCurrentIndex() + + Clears the current index. Emits currentChanged(). */ /*! \qmlsignal ItemSelectionModel::selectionChanged(QItemSelection selected, QItemSelection deselected) + + This signal is emitted whenever the selection changes. The change in the + selection is represented as an item selection of \a deselected items and + an item selection of \a selected items. + + Note the that the current index changes independently from the selection. + Also note that this signal will not be emitted when the item model is reset. + + \sa select(), currentChanged() */ /*! \qmlsignal ItemSelectionModel::currentChanged(QModelIndex current, QModelIndex previous) + + This signal is emitted whenever the current item changes. The \a previous + model item index is replaced by the \a current index as the selection's + current item. + + Note that this signal will not be emitted when the item model is reset. + + \sa currentIndex(), setCurrentIndex(), selectionChanged() */ -- cgit v1.2.3 From 0f3c382705b8017f929977b84b573f880fc5a707 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 4 Jul 2018 08:44:43 +0300 Subject: Fix build without GUI module Qt Quick has a dependency to gui, but there is no way to disable an entire configure module from the configure system. Add module checks to configure.json so that it passes even without the gui module present. Fixes "Unknown feature object movie in expression 'features.movie'." Task-number: QTBUG-56656 Change-Id: I16355b7e218c32cab33e8ef9a6012da3e55656bb Reviewed-by: Oswald Buddenhagen Reviewed-by: Simon Hausmann --- src/quick/configure.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/quick/configure.json b/src/quick/configure.json index ea1d49baad..2c57c3318f 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -45,7 +45,7 @@ "label": "AnimatedImage item", "purpose": "Provides the AnimatedImage item.", "section": "Qt Quick", - "condition": "features.movie", + "condition": "module.gui && features.movie", "output": [ "privateFeature" ] @@ -111,7 +111,7 @@ "label": "Particle support", "purpose": "Provides a particle system.", "section": "Qt Quick", - "condition": "features.quick-shadereffect && features.quick-sprite && features.opengl", + "condition": "module.gui && features.quick-shadereffect && features.quick-sprite && features.opengl", "output": [ "privateFeature" ] -- cgit v1.2.3 From a30138cae86268d71415bc88cfba157977f4a442 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Tue, 31 Jul 2018 15:52:04 +0200 Subject: Doc: Use [] instead of new Array() in snippet This change removes warning about using new Array() as constructor with the snippet in Qt Creator. Task-number: QTBUG-65891 Change-Id: I858601c21d703e4226db4f4c4d9ef52ec6418ed8 Reviewed-by: Nico Vertriest Reviewed-by: Mitch Curtis --- src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc b/src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc index c4f44d7d40..a5f730e8d4 100644 --- a/src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc +++ b/src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc @@ -67,7 +67,7 @@ For example, the standard \c Date and \c Array types are available, as below: import QtQuick 2.0 Item { - property var theArray: new Array() + property var theArray: [] property var theDate: new Date() Component.onCompleted: { -- cgit v1.2.3