diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-24 23:36:29 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-24 23:36:29 (GMT) |
| commit | bfff04ba4fab92e1cfa57954c9df2d3b5ed807ef (patch) | |
| tree | 8209047915b6026c62658dfe3ba2e6d2237f8ba2 /src/declarative/util | |
| parent | 057aba1a063b5dcfcdafaba94623cb40a970c9c4 (diff) | |
| parent | 98c4fb27bb930f19365395a3fd75e4c3012640cb (diff) | |
| download | Qt-bfff04ba4fab92e1cfa57954c9df2d3b5ed807ef.zip Qt-bfff04ba4fab92e1cfa57954c9df2d3b5ed807ef.tar.gz Qt-bfff04ba4fab92e1cfa57954c9df2d3b5ed807ef.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qmlpackage.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlpackage.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp index bfad44c..107bcdb 100644 --- a/src/declarative/util/qmlpackage.cpp +++ b/src/declarative/util/qmlpackage.cpp @@ -142,7 +142,7 @@ QObject *QmlPackage::part(const QString &name) return 0; } -QObject *QmlPackage::qmlAttachedProperties(QObject *o) +QmlPackageAttached *QmlPackage::qmlAttachedProperties(QObject *o) { return new QmlPackageAttached(o); } 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); |