diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-28 03:48:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-28 03:48:09 (GMT) |
| commit | f517fb87487ae34b468f9b3d2bc965fbcaa88452 (patch) | |
| tree | a2ecc3e06b7b88d323ec96fe256b754ba1ff8efe /src/declarative | |
| parent | 32a0d05aab9f2c3108d2f4a37d04e82bf0f0d8a2 (diff) | |
| parent | 74d548094307f3f3609890d839d5742296e611da (diff) | |
| download | Qt-f517fb87487ae34b468f9b3d2bc965fbcaa88452.zip Qt-f517fb87487ae34b468f9b3d2bc965fbcaa88452.tar.gz Qt-f517fb87487ae34b468f9b3d2bc965fbcaa88452.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
A patch for 'Fix to QtOpenGL crash'
Always recreate backing store when TLW transparency changes
Crash in QDeclarativeCompiler::indexOfProperty
Fix to QtOpenGL crash
Diffstat (limited to 'src/declarative')
| -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; |