diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:53:18 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:53:18 +0100 |
| commit | f4ce60ca6b92c5cbfebf7ed5f8436e5d84bfeab4 (patch) | |
| tree | 26da932a85bd80c486a1adc6621aa1427b80a968 /src | |
| parent | f7e1a38eb8b548a739e8e67eb7e5e6af3c4c0bc7 (diff) | |
| parent | a0496abe3890766638e8601c4bd11ba1755138e3 (diff) | |
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: Iceeaa61ed0526088202ed81216f6fbebe6f9dcd5
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick3d/quick3d/items/quick3dentityloader_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h index beb72ba79..611d86cb2 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader_p.h +++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h @@ -76,7 +76,7 @@ class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntityLoader : public QEntity Q_PROPERTY(QObject *entity READ entity NOTIFY entityChanged) Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) - Q_PROPERTY(QQmlComponent *sourceComponent WRITE setSourceComponent NOTIFY sourceComponentChanged REVISION 12) + Q_PROPERTY(QQmlComponent *sourceComponent READ sourceComponent WRITE setSourceComponent NOTIFY sourceComponentChanged REVISION 12) public: enum Status { Null = 0, |