diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-05-02 16:47:38 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-05-02 16:51:39 +0200 |
| commit | 4ee19117e0c8cbe7365ee75710fdeaaa6050bd68 (patch) | |
| tree | 6a1c6aa17a71c7358e1dadfb251f6fee8fdaa16d /src/ivicore/qiviabstractfeature.h | |
| parent | e9aeb8b31267b50dd84660c2993ff9711c80a220 (diff) | |
| parent | 63103377e1beccee3ddeccd93452964afc32326c (diff) | |
| download | qtivi-4ee19117e0c8cbe7365ee75710fdeaaa6050bd68.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Ib3cd68bc73d1e4ba4231a00bdadaff41b2c15edb
Diffstat (limited to 'src/ivicore/qiviabstractfeature.h')
| -rw-r--r-- | src/ivicore/qiviabstractfeature.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ivicore/qiviabstractfeature.h b/src/ivicore/qiviabstractfeature.h index 02e974b..1e42957 100644 --- a/src/ivicore/qiviabstractfeature.h +++ b/src/ivicore/qiviabstractfeature.h @@ -57,8 +57,8 @@ class Q_QTIVICORE_EXPORT QIviAbstractFeature : public QObject, public QQmlParser Q_OBJECT Q_INTERFACES(QQmlParserStatus) - Q_PROPERTY(DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged) - Q_PROPERTY(DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged) + Q_PROPERTY(QIviAbstractFeature::DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged) + Q_PROPERTY(QIviAbstractFeature::DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged) Q_PROPERTY(QIviServiceObject *serviceObject READ serviceObject WRITE setServiceObject NOTIFY serviceObjectChanged) Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged) Q_PROPERTY(bool isInitialized READ isInitialized NOTIFY isInitializedChanged) |