summaryrefslogtreecommitdiffstats
path: root/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-22 15:59:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-22 15:59:50 (GMT)
commitea9f34568acd1286f5ed4e7f2bf760982a4e4579 (patch)
tree232e346dba7226f35af80043e072538dba473201 /src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
parentf68f1de5b866a050c4b39f8eed984831b0e6956e (diff)
parent1d8b7f41a5393f77eb3079513b083739edd90b91 (diff)
downloadQt-ea9f34568acd1286f5ed4e7f2bf760982a4e4579.zip
Qt-ea9f34568acd1286f5ed4e7f2bf760982a4e4579.tar.gz
Qt-ea9f34568acd1286f5ed4e7f2bf760982a4e4579.tar.bz2
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (329 commits) Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one qdoc: Avoid infinite loops in table of contents generation. Bump Qt version to 4.7.4 Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. Remove incorrect check in qpixmap autotest. Change the pooled QGLPixmapData to be backed by QVolatileImage. Started changes-4.7.4 file Fix endianness detection with gcc 4.6 -flto -fwhole-program remove redundand validateModes() call Changed s60 style not to rely on QPixmapData::toNativeType(). Add missing bitmap locking to QVGPixmapData::fromNativeType. Don't crash calling QTextDocument::blockBoundingRect on invalid block Prepare fromSymbianCFbsBitmap autotest for 16 bpp format. Fix writing to an attached property from script. fixes/improvements for new QML right-to-left docs Fix license headers in example code Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro Added setSwitchPolicy to MeeGo graphicssystem helper API. ...
Diffstat (limited to 'src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp')
-rw-r--r--src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp2
1 files changed, 1 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();
}