From a129444bb0156c936900dbd2f12bd9f427ff366c Mon Sep 17 00:00:00 2001 From: Qt by Nokia Date: Wed, 27 Apr 2011 14:13:26 +0200 Subject: Initial import from qtquick2. Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469 --- src/declarative/qml/qdeclarativepropertycache_p.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/declarative/qml/qdeclarativepropertycache_p.h') diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h index eeeff1aea1..65a8725b8f 100644 --- a/src/declarative/qml/qdeclarativepropertycache_p.h +++ b/src/declarative/qml/qdeclarativepropertycache_p.h @@ -84,20 +84,21 @@ public: IsWritable = 0x00000002, IsResettable = 0x00000004, IsAlias = 0x00000008, + IsFinal = 0x00000010, // These are mutualy exclusive - IsFunction = 0x00000010, - IsQObjectDerived = 0x00000020, - IsEnumType = 0x00000040, - IsQList = 0x00000080, - IsQmlBinding = 0x00000100, - IsQScriptValue = 0x00000200, + IsFunction = 0x00000020, + IsQObjectDerived = 0x00000040, + IsEnumType = 0x00000080, + IsQList = 0x00000100, + IsQmlBinding = 0x00000200, + IsQScriptValue = 0x00000400, // Apply only to IsFunctions - IsVMEFunction = 0x00000400, - HasArguments = 0x00000800, - IsSignal = 0x00001000, - IsVMESignal = 0x00002000 + IsVMEFunction = 0x00000800, + HasArguments = 0x00001000, + IsSignal = 0x00002000, + IsVMESignal = 0x00004000 }; Q_DECLARE_FLAGS(Flags, Flag) -- cgit v1.2.3 From 30327650798ba63281c7b9344c9d824d00dce82a Mon Sep 17 00:00:00 2001 From: Charles Yin Date: Tue, 15 Mar 2011 12:10:01 +1000 Subject: cache the arguments in property cache data Change-Id: Ie02b94c2ddb1d5d7b7bb6556a01a5ae86a438c57 (cherry picked from commit 39fed3e2601935c1d6834bb5e75266e5b280e5cd) --- src/declarative/qml/qdeclarativepropertycache_p.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/declarative/qml/qdeclarativepropertycache_p.h') diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h index 65a8725b8f..86ccfe0187 100644 --- a/src/declarative/qml/qdeclarativepropertycache_p.h +++ b/src/declarative/qml/qdeclarativepropertycache_p.h @@ -64,7 +64,6 @@ QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QMetaProperty; - class Q_AUTOTEST_EXPORT QDeclarativePropertyCache : public QDeclarativeRefCount, public QDeclarativeCleanup { public: @@ -74,6 +73,7 @@ public: struct Data { inline Data(); + inline bool operator==(const Data &); enum Flag { @@ -115,8 +115,9 @@ public: int overrideIndex : 31; int revision; int metaObjectOffset; - + QVector paramTypes; static Flags flagsForProperty(const QMetaProperty &, QDeclarativeEngine *engine = 0); + int enumType(const QMetaObject *meta, const QString &strname); void load(const QMetaProperty &, QDeclarativeEngine *engine = 0); void load(const QMetaMethod &); QString name(QObject *); -- cgit v1.2.3 From c741910ef6857e355c0715b872902df87fd4443f Mon Sep 17 00:00:00 2001 From: Charles Yin Date: Wed, 25 May 2011 13:45:18 +1000 Subject: Revert "cache the arguments in property cache data" This reverts commit 30327650798ba63281c7b9344c9d824d00dce82a. --- src/declarative/qml/qdeclarativepropertycache_p.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/declarative/qml/qdeclarativepropertycache_p.h') diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h index 86ccfe0187..65a8725b8f 100644 --- a/src/declarative/qml/qdeclarativepropertycache_p.h +++ b/src/declarative/qml/qdeclarativepropertycache_p.h @@ -64,6 +64,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QMetaProperty; + class Q_AUTOTEST_EXPORT QDeclarativePropertyCache : public QDeclarativeRefCount, public QDeclarativeCleanup { public: @@ -73,7 +74,6 @@ public: struct Data { inline Data(); - inline bool operator==(const Data &); enum Flag { @@ -115,9 +115,8 @@ public: int overrideIndex : 31; int revision; int metaObjectOffset; - QVector paramTypes; + static Flags flagsForProperty(const QMetaProperty &, QDeclarativeEngine *engine = 0); - int enumType(const QMetaObject *meta, const QString &strname); void load(const QMetaProperty &, QDeclarativeEngine *engine = 0); void load(const QMetaMethod &); QString name(QObject *); -- cgit v1.2.3