diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:24:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:28:48 +0200 |
| commit | 9556f6d075b61fa95d6e1057f305e522a26f71d6 (patch) | |
| tree | 53190472453390810c47b9b5a47b23188a00267e /src/3rdparty/masm/stubs/ExecutableAllocator.h | |
| parent | 42ffe9b193a5bd958b0853233fd0d94170722bd1 (diff) | |
| parent | 1fd0cdc6a2e01775d8a79c6614910cc5a2fbf2b3 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquicktext.cpp
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
Diffstat (limited to 'src/3rdparty/masm/stubs/ExecutableAllocator.h')
| -rw-r--r-- | src/3rdparty/masm/stubs/ExecutableAllocator.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h index f937f93025..5f7d5678ab 100644 --- a/src/3rdparty/masm/stubs/ExecutableAllocator.h +++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h @@ -114,6 +114,9 @@ struct ExecutableAllocator { #if !OS(WINRT) DWORD oldProtect; VirtualProtect(reinterpret_cast<void*>(roundAddr), size + (iaddr - roundAddr), PAGE_EXECUTE_READWRITE, &oldProtect); +#else + (void)size; // suppress unused parameter warning + (void)roundAddr; // suppress unused parameter warning #endif #else int mode = PROT_READ | PROT_EXEC; |