summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-11 07:53:42 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-11 07:54:35 (GMT)
commit303730a3fdd399a3e0a65b08338b4db75aa2acee (patch)
tree4d265dfdf43a214a44f2f1e0408f6e873a1c671e /tests/auto/declarative/qdeclarativeecmascript/testtypes.h
parent79dc9daa146410c7da8d4691e9a4489251980ab3 (diff)
downloadQt-303730a3fdd399a3e0a65b08338b4db75aa2acee.zip
Qt-303730a3fdd399a3e0a65b08338b4db75aa2acee.tar.gz
Qt-303730a3fdd399a3e0a65b08338b4db75aa2acee.tar.bz2
Replace QDeclarativeContext::addDefaultObject() -> setContextObject()
It is faster and easier to use to just support a single context object.
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/testtypes.h')
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/testtypes.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
index a283e3f..78a5e0f 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
@@ -207,18 +207,10 @@ class MyDefaultObject1 : public QObject
Q_OBJECT
Q_PROPERTY(int horseLegs READ horseLegs CONSTANT);
Q_PROPERTY(int antLegs READ antLegs CONSTANT);
+ Q_PROPERTY(int emuLegs READ emuLegs CONSTANT);
public:
int horseLegs() const { return 4; }
int antLegs() const { return 6; }
-};
-
-class MyDefaultObject2 : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(int antLegs READ antLegs CONSTANT);
- Q_PROPERTY(int emuLegs READ emuLegs CONSTANT);
-public:
- int antLegs() const { return 5; } // Had an accident
int emuLegs() const { return 2; }
};