diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-08-27 12:22:14 +0200 |
|---|---|---|
| committer | paolo <paolo.angelelli@qt.io> | 2017-08-27 12:24:05 +0200 |
| commit | 05703dd5271a2b25ee18dda6c136a5bee0f92629 (patch) | |
| tree | 72668686841f3cc1df9384b90863e0eb175f53e6 /src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h | |
| parent | b68b88373beb884c77ec9813cac1e9a79854b957 (diff) | |
| parent | d22e6d09f1607e694694d2ae5b2f447605a8782e (diff) | |
| download | qtlocation-05703dd5271a2b25ee18dda6c136a5bee0f92629.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h
Change-Id: I4940db79ebe500ff7e37ded42c7d29d7ccfb6253
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h index 426c6b4d..c1ad4987 100644 --- a/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h +++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h @@ -78,9 +78,12 @@ public: void setValue(const QVariant &value); QVariant value() const; + bool isInitialized() const; + Q_SIGNALS: void nameChanged(const QString &name); void valueChanged(const QVariant &value); + void initialized(); private: QString name_; @@ -210,6 +213,8 @@ Q_SIGNALS: void allowExperimentalChanged(bool allow); private: + bool parametersReady(); + void tryAttach(); static void parameter_append(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, QDeclarativeGeoServiceProviderParameter *mapObject); static int parameter_count(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop); static QDeclarativeGeoServiceProviderParameter *parameter_at(QQmlListProperty<QDeclarativeGeoServiceProviderParameter> *prop, int index); |