diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-29 12:28:09 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-29 09:39:41 +0200 |
commit | 8fed8bf724b0df6e7b63080a98955f2e295f11c6 (patch) | |
tree | 06f89ae0bf640966d3a81d5ce5b346aac6e15211 /src/declarative/qml/qdeclarativecompiler.cpp | |
parent | aaae5636aec4ad6185b97b361d9a6e938ad2ae46 (diff) |
Fix alias warnings in QDeclarativeCompiler
Task-number: QTBUG-19736 QTBUG-19693
Change-Id: Ice6b9e0d4f11c75350a3028af5d2479d435d1f69
Reviewed-on: http://codereview.qt.nokia.com/2364
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index a0b1d8f176..7a15aed460 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -455,7 +455,8 @@ void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop, QTime time = QDeclarativeStringConverters::timeFromString(string); instr.setType(QDeclarativeInstruction::StoreTime); instr.storeTime.propertyIndex = prop.propertyIndex(); - instr.storeTime.time = *(QDeclarativeInstruction::instr_storeTime::QTime *)&time; + Q_ASSERT(sizeof(instr.storeTime.time) == sizeof(QTime)); + ::memcpy(&instr.storeTime.time, &time, sizeof(QTime)); } break; case QVariant::DateTime: @@ -465,7 +466,8 @@ void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop, instr.setType(QDeclarativeInstruction::StoreDateTime); instr.storeDateTime.propertyIndex = prop.propertyIndex(); instr.storeDateTime.date = dateTime.date().toJulianDay(); - instr.storeDateTime.time = *(QDeclarativeInstruction::instr_storeTime::QTime *)&time; + Q_ASSERT(sizeof(instr.storeDateTime.time) == sizeof(QTime)); + ::memcmp(&instr.storeDateTime.time, &time, sizeof(QTime)); } break; #endif // QT_NO_DATESTRING |