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>
This commit is contained in:
parent
7a8842460d
commit
f6cc3c9a73
|
@ -39,11 +39,6 @@
|
||||||
#ifndef MASM_EXECUTABLEALLOCATOR_H
|
#ifndef MASM_EXECUTABLEALLOCATOR_H
|
||||||
#define MASM_EXECUTABLEALLOCATOR_H
|
#define MASM_EXECUTABLEALLOCATOR_H
|
||||||
|
|
||||||
// Defined via mkspec
|
|
||||||
#if _MSC_VER >= 1900
|
|
||||||
#include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <RefPtr.h>
|
#include <RefPtr.h>
|
||||||
#include <RefCounted.h>
|
#include <RefCounted.h>
|
||||||
#include <wtf/PageBlock.h>
|
#include <wtf/PageBlock.h>
|
||||||
|
@ -117,13 +112,11 @@ struct ExecutableAllocator {
|
||||||
DWORD oldProtect;
|
DWORD oldProtect;
|
||||||
# if !OS(WINRT)
|
# if !OS(WINRT)
|
||||||
VirtualProtect(addr, size, PAGE_READWRITE, &oldProtect);
|
VirtualProtect(addr, size, PAGE_READWRITE, &oldProtect);
|
||||||
# elif _MSC_VER >= 1900
|
# else
|
||||||
bool hr = VirtualProtectFromApp(addr, size, PAGE_READWRITE, &oldProtect);
|
bool hr = VirtualProtectFromApp(addr, size, PAGE_READWRITE, &oldProtect);
|
||||||
if (!hr) {
|
if (!hr) {
|
||||||
Q_UNREACHABLE();
|
Q_UNREACHABLE();
|
||||||
}
|
}
|
||||||
# else
|
|
||||||
(void)oldProtect;
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
int mode = PROT_READ | PROT_WRITE;
|
int mode = PROT_READ | PROT_WRITE;
|
||||||
|
@ -152,13 +145,11 @@ struct ExecutableAllocator {
|
||||||
DWORD oldProtect;
|
DWORD oldProtect;
|
||||||
# if !OS(WINRT)
|
# if !OS(WINRT)
|
||||||
VirtualProtect(addr, size, PAGE_EXECUTE_READ, &oldProtect);
|
VirtualProtect(addr, size, PAGE_EXECUTE_READ, &oldProtect);
|
||||||
# elif _MSC_VER >= 1900
|
# else
|
||||||
bool hr = VirtualProtectFromApp(addr, size, PAGE_EXECUTE_READ, &oldProtect);
|
bool hr = VirtualProtectFromApp(addr, size, PAGE_EXECUTE_READ, &oldProtect);
|
||||||
if (!hr) {
|
if (!hr) {
|
||||||
Q_UNREACHABLE();
|
Q_UNREACHABLE();
|
||||||
}
|
}
|
||||||
# else
|
|
||||||
(void)oldProtect;
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
int mode = PROT_READ | PROT_EXEC;
|
int mode = PROT_READ | PROT_EXEC;
|
||||||
|
|
|
@ -32,19 +32,8 @@
|
||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
#include <wtf/Assertions.h>
|
#include <wtf/Assertions.h>
|
||||||
|
|
||||||
#if _MSC_VER >= 1900
|
|
||||||
// Try to use JIT by default and fallback to non-JIT on first error
|
// Try to use JIT by default and fallback to non-JIT on first error
|
||||||
static bool qt_winrt_use_jit = true;
|
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 {
|
namespace WTF {
|
||||||
|
|
||||||
|
|
|
@ -75,7 +75,6 @@ CompiledData::Unit *CompilationUnitMapper::open(const QString &cacheFileName, co
|
||||||
CloseHandle(handle);
|
CloseHandle(handle);
|
||||||
});
|
});
|
||||||
|
|
||||||
#if !defined(Q_OS_WINRT) || _MSC_VER >= 1900
|
|
||||||
CompiledData::Unit header;
|
CompiledData::Unit header;
|
||||||
DWORD bytesRead;
|
DWORD bytesRead;
|
||||||
if (!ReadFile(handle, reinterpret_cast<char *>(&header), sizeof(header), &bytesRead, nullptr)) {
|
if (!ReadFile(handle, reinterpret_cast<char *>(&header), sizeof(header), &bytesRead, nullptr)) {
|
||||||
|
@ -115,19 +114,12 @@ CompiledData::Unit *CompilationUnitMapper::open(const QString &cacheFileName, co
|
||||||
}
|
}
|
||||||
|
|
||||||
return reinterpret_cast<CompiledData::Unit*>(dataPtr);
|
return reinterpret_cast<CompiledData::Unit*>(dataPtr);
|
||||||
#else
|
|
||||||
Q_UNUSED(sourcePath);
|
|
||||||
*errorString = QStringLiteral("Compilation unit mapping not supported on WinRT 8.1");
|
|
||||||
return nullptr;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CompilationUnitMapper::close()
|
void CompilationUnitMapper::close()
|
||||||
{
|
{
|
||||||
#if !defined(Q_OS_WINRT) || _MSC_VER >= 1900
|
|
||||||
if (dataPtr != nullptr)
|
if (dataPtr != nullptr)
|
||||||
UnmapViewOfFile(dataPtr);
|
UnmapViewOfFile(dataPtr);
|
||||||
#endif
|
|
||||||
dataPtr = nullptr;
|
dataPtr = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -443,7 +443,6 @@ The following functions are also on the Qt object.
|
||||||
\li \c "unix" - Other Unix-based OS
|
\li \c "unix" - Other Unix-based OS
|
||||||
\li \c "windows" - Windows
|
\li \c "windows" - Windows
|
||||||
\li \c "winrt" - WinRT / UWP
|
\li \c "winrt" - WinRT / UWP
|
||||||
\li \c "winphone" - Windows Phone
|
|
||||||
\endlist
|
\endlist
|
||||||
\endtable
|
\endtable
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -65,8 +65,6 @@ QString QQmlPlatform::os()
|
||||||
return QStringLiteral("tvos");
|
return QStringLiteral("tvos");
|
||||||
#elif defined(Q_OS_MAC)
|
#elif defined(Q_OS_MAC)
|
||||||
return QStringLiteral("osx");
|
return QStringLiteral("osx");
|
||||||
#elif defined(Q_OS_WINPHONE)
|
|
||||||
return QStringLiteral("winphone");
|
|
||||||
#elif defined(Q_OS_WINRT)
|
#elif defined(Q_OS_WINRT)
|
||||||
return QStringLiteral("winrt");
|
return QStringLiteral("winrt");
|
||||||
#elif defined(Q_OS_WIN)
|
#elif defined(Q_OS_WIN)
|
||||||
|
|
Loading…
Reference in New Issue