diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-12 16:05:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-17 14:05:18 +0000 |
| commit | 9fcca80bc4682fd274d2e4d8014390962dab5daa (patch) | |
| tree | c9562bed09a476acea77ffd76259e0bfda5f7e2f /src/qml/compiler/qv4compileddata_p.h | |
| parent | 9132b7731c5e2b418d240bac998a10112be50938 (diff) | |
Make the unit mapping on Windows configurable with regards to executable mapping
If we generate byte code, then we can mmap without the executable flags,
otherwise we need them. This should make things work out of the box on
platforms where special rights are needed before executable mappings are
allowed.
Change-Id: I24e663f85d661bc51cd3bf2463547b1d1590ea32
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4compileddata_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index a6ca1594a4..b71c1d8185 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 0x02 +#define QV4_DATA_STRUCTURE_VERSION 0x03 class QIODevice; class QQmlPropertyCache; @@ -619,7 +619,8 @@ struct Unit IsQml = 0x2, StaticData = 0x4, // Unit data persistent in memory? IsSingleton = 0x8, - IsSharedLibrary = 0x10 // .pragma shared? + IsSharedLibrary = 0x10, // .pragma shared? + ContainsMachineCode = 0x20 // used to determine if we need to mmap with execute permissions }; LEUInt32 flags; LEUInt32 stringTableSize; |