diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/quick3d/quick3d/items/quick3dentityloader_p.h | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/quick3d/quick3d/items/quick3dentityloader_p.h')
-rw-r--r-- | src/quick3d/quick3d/items/quick3dentityloader_p.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h index 5721af115..6a2fe5473 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader_p.h +++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h @@ -51,10 +51,9 @@ // We mean it. // -#include <QObject> -#include <QUrl> - #include <Qt3DCore/QEntity> +#include <QtCore/QObject> +#include <QtCore/QUrl> #include <Qt3DQuick/private/qt3dquick_global_p.h> @@ -74,7 +73,16 @@ class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntityLoader : public QEntity Q_OBJECT 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) public: + enum Status { + Null = 0, + Loading, + Ready, + Error + }; + Q_ENUM(Status) + explicit Quick3DEntityLoader(QNode *parent = 0); ~Quick3DEntityLoader(); @@ -83,9 +91,12 @@ public: QUrl source() const; void setSource(const QUrl &url); + Status status() const; + Q_SIGNALS: void entityChanged(); void sourceChanged(); + void statusChanged(Status status); private: Q_DECLARE_PRIVATE(Quick3DEntityLoader) |