diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-05 07:23:46 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-05 07:23:46 (GMT) |
commit | 70569e02dae94352c0249e0210cc6b67897af337 (patch) | |
tree | 66d522c1e75ef3bbd4cc9769971da73bf6f7620a /src/declarative/qml | |
parent | 48568f402055dc5ea2bf59224ff06b3050c1927d (diff) | |
parent | 9f67de1530cc13344109cf9c3b6eba937f4a75de (diff) | |
download | Qt-70569e02dae94352c0249e0210cc6b67897af337.zip Qt-70569e02dae94352c0249e0210cc6b67897af337.tar.gz Qt-70569e02dae94352c0249e0210cc6b67897af337.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml')
-rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 6 | ||||
-rw-r--r-- | src/declarative/qml/qmlengine.cpp | 2 | ||||
-rw-r--r-- | src/declarative/qml/qmlparserstatus.cpp | 7 | ||||
-rw-r--r-- | src/declarative/qml/qmlparserstatus.h | 2 | ||||
-rw-r--r-- | src/declarative/qml/qmlpropertyvaluesource.cpp | 3 |
5 files changed, 15 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index b1beb9c..72d4e08 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -256,7 +256,7 @@ QmlComponent::QmlComponent(QmlEngine *engine, const QUrl &url, QObject *parent) } /*! - Create a QmlComponent from the given XML \a data. If provided, \a filename + Create a QmlComponent from the given QML \a data. If provided, \a url is used to set the component name, and to provide a base path for items resolved by this component. */ @@ -283,8 +283,8 @@ QmlComponent::QmlComponent(QmlEngine *engine, QmlCompiledComponent *cc, int star } /*! - Sets the QmlComponent to use the given XML \a data. If provided, - \a filename is used to set the component name, and to provide a base path + Sets the QmlComponent to use the given QML \a data. If provided, + \a url is used to set the component name, and to provide a base path for items resolved by this component. */ void QmlComponent::setData(const QByteArray &data, const QUrl &url) diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 30848c1..f8b7ad6 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -373,7 +373,7 @@ bool QmlEnginePrivate::loadCache(QmlBasicScriptNodeCache &cache, const QString & \code QmlEngine engine; - QmlComponent component("<Text text=\"Hello world!\"/>"); + QmlComponent component("Text { text: \"Hello world!\" }"); QFxItem *item = qobject_cast<QFxItem *>(component.create(&engine)); //add item to view, etc diff --git a/src/declarative/qml/qmlparserstatus.cpp b/src/declarative/qml/qmlparserstatus.cpp index 1f49553..71b7adf 100644 --- a/src/declarative/qml/qmlparserstatus.cpp +++ b/src/declarative/qml/qmlparserstatus.cpp @@ -49,6 +49,13 @@ QT_BEGIN_NAMESPACE */ /*! + Destroys the parser status instance. +*/ +QmlParserStatus::~QmlParserStatus() +{ +} + +/*! Invoked after class creation, but before any properties have been set. */ void QmlParserStatus::classBegin() diff --git a/src/declarative/qml/qmlparserstatus.h b/src/declarative/qml/qmlparserstatus.h index 1ec50ba..bb3691c 100644 --- a/src/declarative/qml/qmlparserstatus.h +++ b/src/declarative/qml/qmlparserstatus.h @@ -53,7 +53,7 @@ QT_MODULE(Declarative) class Q_DECLARATIVE_EXPORT QmlParserStatus { public: - virtual ~QmlParserStatus() {} + virtual ~QmlParserStatus(); virtual void classBegin(); virtual void classComplete(); diff --git a/src/declarative/qml/qmlpropertyvaluesource.cpp b/src/declarative/qml/qmlpropertyvaluesource.cpp index 78b0495..44e1952 100644 --- a/src/declarative/qml/qmlpropertyvaluesource.cpp +++ b/src/declarative/qml/qmlpropertyvaluesource.cpp @@ -50,6 +50,9 @@ QT_BEGIN_NAMESPACE */ QML_DEFINE_NOCREATE_TYPE(QmlPropertyValueSource); +/*! + Constructs a QmlPropertyValueSource with parent \a parent. +*/ QmlPropertyValueSource::QmlPropertyValueSource(QObject *parent) : QObject(parent) |