diff options
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/typesystem/topic.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/types/qqmlitemselectionmodel.qdoc | 63 | ||||
| -rw-r--r-- | src/quick/configure.json | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 8 |
4 files changed, 66 insertions, 11 deletions
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: { 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() */ diff --git a/src/quick/configure.json b/src/quick/configure.json index ab356be557..9ec3531ef4 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -46,7 +46,7 @@ "label": "AnimatedImage item", "purpose": "Provides the AnimatedImage item.", "section": "Qt Quick", - "condition": "features.movie", + "condition": "module.gui && features.movie", "output": [ "privateFeature" ] @@ -120,7 +120,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" ] diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index c23aca622e..6b5d595c26 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -1817,10 +1817,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. |