diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-11-06 00:23:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 09:07:08 +0100 |
| commit | eeabbf554880f61979fa0a9ecf87ba380cd70863 (patch) | |
| tree | 2801ba1223fba1c46cd3bc26a7881cfe8196052f /src/3rdparty/masm/masm.pri | |
| parent | 3a61da32e485621c9afbd453d22cbe1f6c25479e (diff) | |
Fix build on WinRT
Disable JIT and avoid unsupported functions under WinRT.
Also add MSVC's ARM flag to the double conversion white list.
Change-Id: I22ec340a20b113fdeefb802ac61812f78a527895
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/3rdparty/masm/masm.pri')
| -rw-r--r-- | src/3rdparty/masm/masm.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index d7b315602e..3fd4aa6cec 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -11,7 +11,8 @@ HEADERS += $$PWD/wtf/FilePrintStream.h HEADERS += $$PWD/wtf/RawPointer.h -win32: SOURCES += $$PWD/wtf/OSAllocatorWin.cpp +winrt: SOURCES += $$PWD/wtf/OSAllocatorWinRT.cpp +else:win32: SOURCES += $$PWD/wtf/OSAllocatorWin.cpp else: SOURCES += $$PWD/wtf/OSAllocatorPosix.cpp HEADERS += $$PWD/wtf/OSAllocator.h |