diff options
| author | James McDonnell <jmcdonnell@blackberry.com> | 2016-10-25 09:23:56 -0400 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-10-25 15:01:54 +0000 |
| commit | 210a4584b87add2061f805ae50eb5079eec48cf5 (patch) | |
| tree | 16f40dd03cf37be834c8296ab7adc9eecd94ff28 | |
| parent | 52599c3cca35be20b53d0de6604743061c3e1c8c (diff) | |
Change Import::type from quint8 to LEUInt32
Import::type used to be a quint32. The switch from quint32 to quint8
changed the alignment of other structures in the compiled blob. On QNX,
the alignment isn't appropriate for some of the instructions that the
compiler uses to access/modify the structures and a BUS error occurs.
Changing Import::type to LEUInt32 puts the alignment back the way it
was before. Simpler than trying to figure out how to get everything
aligned correctly with a quint8 at the front of the structure.
Task-number: QTBUG-56341
Change-Id: Ia6f4daff5f615f9c5dbcc34ce8c3c9a89bab2b69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index 8f68131ced..90cbe04505 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE // Bump this whenever the compiler data structures change in an incompatible way. -#define QV4_DATA_STRUCTURE_VERSION 0x06 +#define QV4_DATA_STRUCTURE_VERSION 0x07 class QIODevice; class QQmlPropertyCache; @@ -587,7 +587,7 @@ struct Import ImportFile = 0x2, ImportScript = 0x3 }; - quint8 type; + LEUInt32 type; LEUInt32 uriIndex; LEUInt32 qualifierIndex; |