aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2013-08-12 18:35:37 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-20 09:29:23 +0200
commitc69fc9e9e070c151d636a501450976be15cf0bac (patch)
tree94379e942cbeda2cc3671112d32f9fa4776f0f16 /src/imports
parent3fd8b5b27dbb39edf5b398b05e58ceccb0a25ebc (diff)
FolderListModel: count property has countChanged notifier
rowCountChanged is kept for compatibility but is inconsistent with the usual naming convention. Change-Id: I8ae72e4783c5edbbcc63319c266ac47e8f3fc5ad Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.cpp1
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index bb65ddbccc..032c32a241 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -100,6 +100,7 @@ void QQuickFolderListModelPrivate::init()
q, SLOT(_q_directoryUpdated(QString, QList<FileProperty>, int, int)));
q->connect(&fileInfoThread, SIGNAL(sortFinished(QList<FileProperty>)),
q, SLOT(_q_sortFinished(QList<FileProperty>)));
+ q->connect(q, SIGNAL(rowCountChanged()), q, SIGNAL(countChanged()));
}
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h
index 68541f1735..3bf9a21d49 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.h
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h
@@ -74,7 +74,7 @@ class QQuickFolderListModel : public QAbstractListModel, public QQmlParserStatus
Q_PROPERTY(bool showDirsFirst READ showDirsFirst WRITE setShowDirsFirst)
Q_PROPERTY(bool showDotAndDotDot READ showDotAndDotDot WRITE setShowDotAndDotDot)
Q_PROPERTY(bool showOnlyReadable READ showOnlyReadable WRITE setShowOnlyReadable)
- Q_PROPERTY(int count READ count NOTIFY rowCountChanged)
+ Q_PROPERTY(int count READ count NOTIFY countChanged)
//![class props]
//![abslistmodel]
@@ -149,6 +149,7 @@ public:
Q_SIGNALS:
void folderChanged();
void rowCountChanged() const;
+ void countChanged() const;
//![notifier]
//![class end]