diff options
Diffstat (limited to 'src/declarative/qml/qmlcomponent.h')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h index 90f7467..fe0c422 100644 --- a/src/declarative/qml/qmlcomponent.h +++ b/src/declarative/qml/qmlcomponent.h @@ -44,6 +44,7 @@ #include <QtCore/qobject.h> #include <QtCore/qstring.h> +#include <QtScript/qscriptvalue.h> #include <QtDeclarative/qfxglobal.h> #include <QtDeclarative/qml.h> #include <QtDeclarative/qmlerror.h> @@ -60,7 +61,7 @@ class QmlEngine; class Q_DECLARATIVE_EXPORT QmlComponent : public QObject { Q_OBJECT - Q_DECLARE_PRIVATE(QmlComponent); + Q_DECLARE_PRIVATE(QmlComponent) public: QmlComponent(QObject *parent = 0); @@ -70,18 +71,20 @@ public: const QUrl &baseUrl=QUrl(), QObject *parent=0); virtual ~QmlComponent(); + Q_ENUMS( Status ); enum Status { Null, Ready, Loading, Error }; Status status() const; - bool isNull() const; - bool isReady() const; - bool isError() const; - bool isLoading() const; + Q_INVOKABLE bool isNull() const; + Q_INVOKABLE bool isReady() const; + Q_INVOKABLE bool isError() const; + Q_INVOKABLE bool isLoading() const; QList<QmlError> errors() const; QUrl url() const; + Q_INVOKABLE QScriptValue createObject(); virtual QObject *create(QmlContext *context = 0); virtual QObject *beginCreate(QmlContext *); virtual void completeCreate(); @@ -101,7 +104,8 @@ private: friend class QmlVME; friend struct QmlCompositeTypeData; }; -QML_DECLARE_TYPE(QmlComponent); +Q_DECLARE_METATYPE(QmlComponent::Status); +QML_DECLARE_TYPE(QmlComponent) QT_END_NAMESPACE |