diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-24 23:58:54 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-24 23:58:54 (GMT) |
| commit | 19038ba0847d3b8ed476d8c3c1d29332d4f80677 (patch) | |
| tree | 0374a25291e47d576dc9c45ef43acd7d830195cc /src/declarative/util/qmlpackage.h | |
| parent | 641c7cbdc52f84c07cf5bb628840bd6072e64764 (diff) | |
| parent | bfff04ba4fab92e1cfa57954c9df2d3b5ed807ef (diff) | |
| download | Qt-19038ba0847d3b8ed476d8c3c1d29332d4f80677.zip Qt-19038ba0847d3b8ed476d8c3c1d29332d4f80677.tar.gz Qt-19038ba0847d3b8ed476d8c3c1d29332d4f80677.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlpackage.h')
| -rw-r--r-- | src/declarative/util/qmlpackage.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qmlpackage.h b/src/declarative/util/qmlpackage.h index 3861890..f4167fd 100644 --- a/src/declarative/util/qmlpackage.h +++ b/src/declarative/util/qmlpackage.h @@ -57,6 +57,7 @@ QT_MODULE(Declarative) *****************************************************************************/ class QmlPackagePrivate; +class QmlPackageAttached; class QmlPackage : public QObject { Q_OBJECT @@ -74,7 +75,7 @@ public: QObject *part(const QString & = QString()); bool hasPart(const QString &); - static QObject *qmlAttachedProperties(QObject *); + static QmlPackageAttached *qmlAttachedProperties(QObject *); }; QML_DECLARE_TYPE(QmlPackage); |