diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-09 10:46:04 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-09 10:46:04 (GMT) |
| commit | de4954fd676c3bbf15abb9bedad4d09adc1c31b4 (patch) | |
| tree | b2ce67c3a485ff5201785f32df6a6105bf25f745 /src/imports | |
| parent | fc954a91625d172ef2dff4b5f9ea615551cb09bf (diff) | |
| parent | dc6b5702e0c488bf51ca029290eb65604bfb1dd5 (diff) | |
| download | Qt-de4954fd676c3bbf15abb9bedad4d09adc1c31b4.zip Qt-de4954fd676c3bbf15abb9bedad4d09adc1c31b4.tar.gz Qt-de4954fd676c3bbf15abb9bedad4d09adc1c31b4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp | 2 | ||||
| -rw-r--r-- | src/imports/gestures/qdeclarativegesturearea.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp index d5726c1..9fe01bf 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp @@ -365,7 +365,7 @@ void QDeclarativeFolderListModel::refresh() { d->folderIndex = QModelIndex(); if (d->count) { - emit beginRemoveRows(QModelIndex(), 0, d->count); + emit beginRemoveRows(QModelIndex(), 0, d->count-1); d->count = 0; emit endRemoveRows(); } diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp index ad44905..aae6a01 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -89,6 +89,10 @@ public: \warning Elements in the Qt.labs module are not guaranteed to remain compatible in future versions. + \warning GestureArea is an experimental element whose development has + been discontinued. PinchArea is available in QtQuick 1.1 and handles + two finger gesture input. + \note This element is only functional on devices with touch input. \qml |