diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-06-12 10:16:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 03:22:11 +0200 |
| commit | e8206bf6ab6ef62b5dd24bf002aa56edecbcec97 (patch) | |
| tree | eaf05e69ed3233f2eb215d3e9aeb114b8cb62f43 /src/quick/items/qquickloader_p.h | |
| parent | fb41baa0e8bfab231a2fc1f42ad2d6ffab93ccfc (diff) | |
Allow Loader to load non-Item types.
Loader has a more convenient API for loading/unloading components
than the dynamic object creation APIs. Remove the Item-only
restriction.
Change-Id: I6f9ecc8514ff1e814f7e56a3386814ba211b7e4f
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquickloader_p.h')
| -rw-r--r-- | src/quick/items/qquickloader_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h index c5f544b0e8..ff6e897509 100644 --- a/src/quick/items/qquickloader_p.h +++ b/src/quick/items/qquickloader_p.h @@ -57,7 +57,7 @@ class Q_AUTOTEST_EXPORT QQuickLoader : public QQuickImplicitSizeItem Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged) Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(QQmlComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceComponentChanged) - Q_PROPERTY(QQuickItem *item READ item NOTIFY itemChanged) + Q_PROPERTY(QObject *item READ item NOTIFY itemChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged) Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged) @@ -85,7 +85,7 @@ public: bool asynchronous() const; void setAsynchronous(bool a); - QQuickItem *item() const; + QObject *item() const; Q_SIGNALS: void itemChanged(); |