diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-05 00:53:33 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-08-05 00:53:33 (GMT) |
| commit | 5b5ce7bef24f6bc8bc984ca95f464ee8d893d34b (patch) | |
| tree | 4731ffbfaa09a9a22db39c31a01b570dab94addc | |
| parent | 45c46cc786c3f63269ea80246082bc5d7d38e893 (diff) | |
| download | Qt-5b5ce7bef24f6bc8bc984ca95f464ee8d893d34b.zip Qt-5b5ce7bef24f6bc8bc984ca95f464ee8d893d34b.tar.gz Qt-5b5ce7bef24f6bc8bc984ca95f464ee8d893d34b.tar.bz2 | |
Fix test
"interface" is a JS reserved word, which have been disallowed as property names.
| -rw-r--r-- | tests/auto/declarative/qmlparser/interfaceProperty.txt | 4 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlparser/testtypes.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qmlparser/interfaceProperty.txt b/tests/auto/declarative/qmlparser/interfaceProperty.txt index c9a20fb..70879ff 100644 --- a/tests/auto/declarative/qmlparser/interfaceProperty.txt +++ b/tests/auto/declarative/qmlparser/interfaceProperty.txt @@ -1,5 +1,5 @@ import Test 1.0 import Qt 4.6 -Object { - interface: MyQmlObject {} +MyQmlObject { + interfaceProperty: MyQmlObject {} } diff --git a/tests/auto/declarative/qmlparser/testtypes.h b/tests/auto/declarative/qmlparser/testtypes.h index 34f3616..ace7ef9 100644 --- a/tests/auto/declarative/qmlparser/testtypes.h +++ b/tests/auto/declarative/qmlparser/testtypes.h @@ -56,7 +56,7 @@ class MyQmlObject : public QObject, public MyInterface, public QmlParserStatus Q_PROPERTY(bool enabled READ enabled WRITE setEnabled) Q_PROPERTY(QRect rect READ rect WRITE setRect) Q_PROPERTY(QMatrix matrix READ matrix WRITE setMatrix) //assumed to be unsupported by QML - Q_PROPERTY(MyInterface *interface READ interface WRITE setInterface) + Q_PROPERTY(MyInterface *interfaceProperty READ interface WRITE setInterface) Q_PROPERTY(int onLiteralSignal READ onLiteralSignal WRITE setOnLiteralSignal); Q_PROPERTY(MyCustomVariantType customType READ customType WRITE setCustomType); Q_INTERFACES(MyInterface QmlParserStatus) |