This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 18 Jan 2017 19:38:56 +1100 Subject: [PATCH] fix msys build Taken from: https://github.com/Alexpux/Qt-builds/blob/master/patches/qt/5.0.x/qt-5.0.0-fix-build-under-msys.patch diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri index 1111111..2222222 100644 --- a/Source/WebCore/DerivedSources.pri +++ b/Source/WebCore/DerivedSources.pri @@ -752,7 +752,7 @@ IDL_ATTRIBUTES_FILE = $$PWD/bindings/scripts/IDLAttributes.txt preprocessIdls.input = IDL_ATTRIBUTES_FILE preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT # FIXME : We need to use only perl at some point. -win_cmd_shell: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC +win_cmd_shell: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC else: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC for(binding, IDL_BINDINGS) { # We need "$$binding" instead of "$$binding ", because Windows' echo writes trailing whitespaces. (http://wkb.ug/88304) From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 22:21:54 +0200 Subject: [PATCH] Include intrin.h for declaration of _mm_mfence taken from: https://aur.archlinux.org/cgit/aur.git/tree/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch?h=mingw-w64-qt5-webkit diff --git a/Source/WTF/wtf/Atomics.h b/Source/WTF/wtf/Atomics.h index 1111111..2222222 100644 --- a/Source/WTF/wtf/Atomics.h +++ b/Source/WTF/wtf/Atomics.h @@ -68,6 +68,8 @@ #elif !COMPILER(GCC) extern "C" void _ReadWriteBarrier(void); #pragma intrinsic(_ReadWriteBarrier) +#else +#include #endif #include #elif OS(QNX) From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 4 Nov 2016 00:44:49 +0300 Subject: [PATCH] Fixed crash (probably miscompilation) with MinGW-w64 5.3.0 Change-Id: Iac1c5fe1879abfaa299ec909e5928912c2354126 taken from: https://github.com/Martchus/PKGBUILDs/blob/c7b900625449ba7f00539d4e23d2500765bc6f9a/qt5-webkit/mingw-w64/0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.cpp b/Source/WebKit/qt/WidgetApi/qwebframe.cpp index 1111111..2222222 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe.cpp +++ b/Source/WebKit/qt/WidgetApi/qwebframe.cpp @@ -119,16 +119,6 @@ QWebFrameAdapter* QWebFramePrivate::createChildFrame(QWebFrameData* frameData) return newFrame->d; } -QWebFrame *QWebFramePrivate::apiHandle() -{ - return q; -} - -QObject *QWebFramePrivate::handle() -{ - return q; -} - void QWebFramePrivate::contentsSizeDidChange(const QSize &size) { emit q->contentsSizeChanged(size); diff --git a/Source/WebKit/qt/WidgetApi/qwebframe_p.h b/Source/WebKit/qt/WidgetApi/qwebframe_p.h index 1111111..2222222 100644 --- a/Source/WebKit/qt/WidgetApi/qwebframe_p.h +++ b/Source/WebKit/qt/WidgetApi/qwebframe_p.h @@ -49,8 +49,8 @@ public: static QWebFrame* kit(const QWebFrameAdapter*); // Adapter implementation - virtual QWebFrame* apiHandle() OVERRIDE; - virtual QObject* handle() OVERRIDE; + virtual QWebFrame* apiHandle() OVERRIDE { return q; } + virtual QObject* handle() OVERRIDE { return q; } virtual void contentsSizeDidChange(const QSize &) OVERRIDE; virtual int scrollBarPolicy(Qt::Orientation) const OVERRIDE; virtual void emitUrlChanged() OVERRIDE;