diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-18 11:21:13 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-08-18 11:21:13 +0000 |
| commit | a820a56eb5a8e4f21ca4a04efe816e40b5645cef (patch) | |
| tree | f86da404570600859efd24a4b942c2c68bca95c3 /src/qml/qml/qqmlvmemetaobject_p.h | |
| parent | f245fc543c479cbc69be886c5d04d4738b491060 (diff) | |
| parent | eb30e3d7ee81c48cea720e7ecd2ed45647bc70ee (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject_p.h')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index 44809a26f0..a320163f23 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -119,7 +119,7 @@ struct QQmlVMEMetaData }; PropertyData *propertyData() const { - return (PropertyData *)(((const char *)this) + sizeof(QQmlVMEMetaData)); + return (PropertyData *)(((char *)const_cast<QQmlVMEMetaData *>(this)) + sizeof(QQmlVMEMetaData)); } AliasData *aliasData() const { |