diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-11-02 11:18:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-09 15:09:22 +0100 |
| commit | e4ff64343c0df1af0f653489735d85ec5de1bd39 (patch) | |
| tree | c00f7f5a29741c5df069a1b109f4047e0c1a555d /src/qml/qml/qqmlinstruction_p.h | |
| parent | 4f63f43cf2da59c2e87ae96e8bd84950490a070b (diff) | |
Fix a few more compiler warnings in release builds
Change-Id: I826226b7ddd4a74037b5bbe9a4a7322d404f53a9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlinstruction_p.h')
| -rw-r--r-- | src/qml/qml/qqmlinstruction_p.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/qml/qml/qqmlinstruction_p.h b/src/qml/qml/qqmlinstruction_p.h index 01b6fa41a4..150ee8df19 100644 --- a/src/qml/qml/qqmlinstruction_p.h +++ b/src/qml/qml/qqmlinstruction_p.h @@ -345,18 +345,13 @@ union QQmlInstruction struct instr_storeTime { QML_INSTR_HEADER int propertyIndex; - struct QTime { - int mds; -#if defined(Q_OS_WINCE) - int startTick; -#endif - } time; + int time; // QTime::fromMSecsSinceStartOfDay }; struct instr_storeDateTime { QML_INSTR_HEADER int propertyIndex; int date; - instr_storeTime::QTime time; + int time; }; struct instr_storeRect { QML_INSTR_HEADER @@ -540,7 +535,7 @@ struct QQmlInstructionMeta { enum { Size = QML_INSTR_SIZE(I, FMT) }; \ typedef QQmlInstruction::instr_##FMT DataType; \ static const DataType &data(const QQmlInstruction &instr) { return instr.FMT; } \ - static void setData(QQmlInstruction &instr, const DataType &v) { instr.FMT = v; } \ + static void setData(QQmlInstruction &instr, const DataType &v) { memcpy(&instr.FMT, &v, Size); } \ }; FOR_EACH_QML_INSTR(QML_INSTR_META_TEMPLATE); #undef QML_INSTR_META_TEMPLATE |