diff options
| author | Chris Axiarlis <chris.axiarlis@nokia.com> | 2012-05-15 16:22:44 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-16 02:23:52 +0200 |
| commit | 89e01acaae12f1e3dedcd51478f49d0fc4b340e8 (patch) | |
| tree | a795432bcd3ac9aee8fbd6aaea238507da2744b9 /src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp | |
| parent | 3c355065fb856d12c15c2300771f8c513d3471ab (diff) | |
| download | qtlocation-89e01acaae12f1e3dedcd51478f49d0fc4b340e8.tar.gz | |
Fix case where second and subsequent searches fail.
When a request is cancelled or fails the emit finished is called. This
causes any subsequent requests to complete immediately, resulting in no
more searches working. Also, the initial state of the plugin should be
Null which correctly matches the documentation.
The state change after the cancel should be overwritten to cancel.
Change-Id: I22c2ffe92fbe70e6391ae4f049368edaeafb1c4d
Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp')
| -rw-r--r-- | src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp index 23ae46d6..ea2fdba6 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp @@ -50,7 +50,7 @@ QDeclarativeSearchModelBase::QDeclarativeSearchModelBase(QObject *parent) : QAbstractListModel(parent), m_plugin(0), m_reply(0), m_searchArea(0), m_complete(false), - m_status(Ready) + m_status(Null) { } @@ -212,7 +212,7 @@ void QDeclarativeSearchModelBase::cancel() m_reply = 0; } - setStatus(Ready); + setStatus(Null); } /*! |