diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-11-23 13:50:16 +0100 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-01-19 14:56:34 +0000 |
| commit | f6cc3c9a73765717c3e296ca97f17ba685f8baf4 (patch) | |
| tree | 2266eb0f809fdc0246889a951bff9e9abe1fe151 /src/3rdparty/masm | |
| parent | 7a8842460dc3c5e4e4ed42e7e2ae5bc619be5c78 (diff) | |
Remove support for WinRT 8.1 and Windows Phone 8.1
Task-number: QTBUG-57288
Change-Id: Id106f09dc824fbd95780dc5b479e16802d183e57
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty/masm')
| -rw-r--r-- | src/3rdparty/masm/stubs/ExecutableAllocator.h | 13 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp | 11 |
2 files changed, 2 insertions, 22 deletions
diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h index 5a3939b7b2..8617229b06 100644 --- a/src/3rdparty/masm/stubs/ExecutableAllocator.h +++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h @@ -39,11 +39,6 @@ #ifndef MASM_EXECUTABLEALLOCATOR_H #define MASM_EXECUTABLEALLOCATOR_H -// Defined via mkspec -#if _MSC_VER >= 1900 -#include <windows.h> -#endif - #include <RefPtr.h> #include <RefCounted.h> #include <wtf/PageBlock.h> @@ -117,13 +112,11 @@ struct ExecutableAllocator { DWORD oldProtect; # if !OS(WINRT) VirtualProtect(addr, size, PAGE_READWRITE, &oldProtect); -# elif _MSC_VER >= 1900 +# else bool hr = VirtualProtectFromApp(addr, size, PAGE_READWRITE, &oldProtect); if (!hr) { Q_UNREACHABLE(); } -# else - (void)oldProtect; # endif # else int mode = PROT_READ | PROT_WRITE; @@ -152,13 +145,11 @@ struct ExecutableAllocator { DWORD oldProtect; # if !OS(WINRT) VirtualProtect(addr, size, PAGE_EXECUTE_READ, &oldProtect); -# elif _MSC_VER >= 1900 +# else bool hr = VirtualProtectFromApp(addr, size, PAGE_EXECUTE_READ, &oldProtect); if (!hr) { Q_UNREACHABLE(); } -# else - (void)oldProtect; # endif # else int mode = PROT_READ | PROT_EXEC; diff --git a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp index b7ad723f07..0a6eda8b98 100644 --- a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp +++ b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp @@ -32,19 +32,8 @@ #include "windows.h" #include <wtf/Assertions.h> -#if _MSC_VER >= 1900 // Try to use JIT by default and fallback to non-JIT on first error static bool qt_winrt_use_jit = true; -#else // _MSC_VER < 1900 -# define PAGE_EXECUTE 0x10 -# define PAGE_EXECUTE_READ 0x20 -# define PAGE_EXECUTE_READWRITE 0x40 -# define MEM_RELEASE 0x8000 -inline void* VirtualAllocFromApp(void*, size_t, int, int) { return 0; } -inline bool VirtualProtectFromApp(void *, size_t, int, DWORD*) { return false; } -inline bool VirtualFree(void *, size_t, DWORD) { return false; } -static bool qt_winrt_use_jit = false; -#endif // _MSC_VER < 1900 namespace WTF { |