diff options
author | aavit <qt-info@nokia.com> | 2011-10-21 07:59:50 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2011-10-21 07:59:50 (GMT) |
commit | cda84350a3e38d7a35e6341720e3e353803b8dea (patch) | |
tree | 240ba38d683ad1256ca7ddd54f51bf6f21962056 /src/declarative/qml/qdeclarativepropertycache_p.h | |
parent | e5098123c12880d922923d1117f7b82995c6b5a0 (diff) | |
parent | 4673878256262802c07303fce1e1f8cc1b7e652b (diff) | |
download | Qt-cda84350a3e38d7a35e6341720e3e353803b8dea.zip Qt-cda84350a3e38d7a35e6341720e3e353803b8dea.tar.gz Qt-cda84350a3e38d7a35e6341720e3e353803b8dea.tar.bz2 |
Merge remote-tracking branch 'qt-fire-review/master'
Diffstat (limited to 'src/declarative/qml/qdeclarativepropertycache_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativepropertycache_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h index 581f519..c648d25 100644 --- a/src/declarative/qml/qdeclarativepropertycache_p.h +++ b/src/declarative/qml/qdeclarativepropertycache_p.h @@ -111,7 +111,7 @@ public: int relatedIndex; // When IsFunction }; uint overrideIndexIsProperty : 1; - int overrideIndex : 31; + signed int overrideIndex : 31; int revision; int metaObjectOffset; |