summaryrefslogtreecommitdiffstats
path: root/src/imports/organizer/qdeclarativeorganizermodel.cpp
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2014-04-20 09:22:00 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-09 09:27:07 +0200
commit5f2ab3b38ac1a57269e610834a425e9fcd342b2b (patch)
tree4f5ba09c5d05a2caf32392b3dc0f55012a8f52fc /src/imports/organizer/qdeclarativeorganizermodel.cpp
parente9da7d2481df8e716865346341dfe624aa7316aa (diff)
[OrganizerModel] Don't delete fetchHint we don't own
Do generally what we're doing for m_filter. Change-Id: I12c54eae27b342b01cd16a6aea714664bde62694 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/imports/organizer/qdeclarativeorganizermodel.cpp')
-rw-r--r--src/imports/organizer/qdeclarativeorganizermodel.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/organizer/qdeclarativeorganizermodel.cpp b/src/imports/organizer/qdeclarativeorganizermodel.cpp
index 1fd631d86..8df7bf782 100644
--- a/src/imports/organizer/qdeclarativeorganizermodel.cpp
+++ b/src/imports/organizer/qdeclarativeorganizermodel.cpp
@@ -641,11 +641,12 @@ QDeclarativeOrganizerItemFetchHint* QDeclarativeOrganizerModel::fetchHint() cons
void QDeclarativeOrganizerModel::setFetchHint(QDeclarativeOrganizerItemFetchHint* fetchHint)
{
Q_D(QDeclarativeOrganizerModel);
- if (fetchHint && fetchHint != d->m_fetchHint) {
+ if (fetchHint != d->m_fetchHint) {
if (d->m_fetchHint)
- delete d->m_fetchHint;
+ disconnect(d->m_fetchHint, SIGNAL(fetchHintChanged()), this, SIGNAL(fetchHintChanged()));
d->m_fetchHint = fetchHint;
- connect(d->m_fetchHint, SIGNAL(fetchHintChanged()), this, SIGNAL(fetchHintChanged()));
+ if (d->m_fetchHint)
+ connect(d->m_fetchHint, SIGNAL(fetchHintChanged()), this, SIGNAL(fetchHintChanged()), Qt::UniqueConnection);
emit fetchHintChanged();
}
}