From 8fed8bf724b0df6e7b63080a98955f2e295f11c6 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Fri, 29 Jul 2011 12:28:09 +1000 Subject: [PATCH] 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 Reviewed-by: Aaron Kennedy --- 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 a0b1d8f..7a15aed 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 -- 1.7.2.5