on xenial help sign in
Some small fixes
6297dc3Michael Terry
plugins/Wizard/timezonemodel.cpp+1
@@ -110,6 +110,7 @@ void TimeZoneLocationModel::filterFinished(GObject *source_object,
110 if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
110 if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
111 TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
111 TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
112 g_clear_object(&model->m_cancellable);
112 g_clear_object(&model->m_cancellable);
113+ model->setListUpdating(false);
113 qWarning() << "Could not filter timezones:" << error->message;
114 qWarning() << "Could not filter timezones:" << error->message;
114 }
115 }
115 return;
116 return;
plugins/Wizard/timezonemodel.h+1−1
@@ -24,7 +24,7 @@
24class TimeZoneLocationModel: public QAbstractListModel
24class TimeZoneLocationModel: public QAbstractListModel
25{
25{
26 Q_OBJECT
26 Q_OBJECT
27− Q_PROPERTY(QString listUpdating READ listUpdating NOTIFY listUpdatingChanged)
27+ Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
28 Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
28 Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
29 Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
29 Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
30 Q_ENUMS(Roles)
30 Q_ENUMS(Roles)