diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-16 19:13:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-16 19:13:57 +0200 |
| commit | f281054d12b53b95df3926e54ac6a99ecf9bc3ca (patch) | |
| tree | 7d30a747cb0d320a068a7bbe3648e7f10ba68d8f /src/declarative/qml/qdeclarativevmemetaobject_p.h | |
| parent | 87b91f933735aa2b7c2295fb8d1cf0692ccf2422 (diff) | |
| parent | 7bf5bb1a7f54f775534a3d940c44d3bf78725306 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I10d9b8383a41aa427793c6ccfdbf0393064d9c49
Diffstat (limited to 'src/declarative/qml/qdeclarativevmemetaobject_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativevmemetaobject_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h index 95e02fd9..f98cc6b5 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject_p.h +++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h @@ -109,7 +109,7 @@ struct QDeclarativeVMEMetaData }; PropertyData *propertyData() const { - return (PropertyData *)(((const char *)this) + sizeof(QDeclarativeVMEMetaData)); + return (PropertyData *)const_cast<char *>(((const char *)this) + sizeof(QDeclarativeVMEMetaData)); } AliasData *aliasData() const { |