From 4668ec8a9bbbe110ed5e08be8dca7a28b564d06d Mon Sep 17 00:00:00 2001 From: Will Wagner Date: Wed, 4 Mar 2015 14:01:59 +0000 Subject: qt5: bump version to 5.4.1 Also remove all patches that have been applied to 5.4.1 branch Signed-off-by: Will Wagner Signed-off-by: Thomas Petazzoni --- ...cpp-Fix-build-on-mips-without-dsp-support.patch | 47 ---------------------- 1 file changed, 47 deletions(-) delete mode 100644 package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch (limited to 'package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch') diff --git a/package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch b/package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch deleted file mode 100644 index ede4d80e33..0000000000 --- a/package/qt5/qt5base/0005-qdrawhelper.cpp-Fix-build-on-mips-without-dsp-support.patch +++ /dev/null @@ -1,47 +0,0 @@ -qdrawhelper.cpp: Fix build on MIPS without DSP support - -The qt_memfill32_asm_mips_dsp function is only declared if -QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it -unless the same macro is defined. - -Backporting an upstream patch to fix this issue. - -Upstream commit: - - https://qt.gitorious.org/qt/qtbase/commit/2ca323ccd4f25f409eff8fc0c9804099b78c2bde - -Signed-off-by: Vicente Olivert Riera - -From 2ca323ccd4f25f409eff8fc0c9804099b78c2bde Mon Sep 17 00:00:00 2001 -From: Eskil Abrahamsen Blomfeldt -Date: Tue, 11 Nov 2014 13:11:54 +0100 -Subject: [PATCH] Android: Compile for MIPS - -The qt_memfill32_asm_mips_dsp function is only declared if -QT_COMPILER_SUPPORTS_MIPS_DSP is defined, so we can't reference it -unless the same macro is defined. - -Change-Id: Ib959b4b969b699ca78804394206266469b4ebf64 -Task-number: QTBUG-36017 -Reviewed-by: Paul Olav Tvete -Reviewed-by: Thiago Macieira ---- - src/gui/painting/qdrawhelper.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp -index f2d27a0..6482cc5 100644 ---- a/src/gui/painting/qdrawhelper.cpp -+++ b/src/gui/painting/qdrawhelper.cpp -@@ -6829,7 +6829,7 @@ void qInitDrawhelperAsm() - qt_fetch_radial_gradient = qt_fetch_radial_gradient_neon; - #endif - --#ifdef Q_PROCESSOR_MIPS_32 -+#if defined(Q_PROCESSOR_MIPS_32) && defined(QT_COMPILER_SUPPORTS_MIPS_DSP) - qt_memfill32 = qt_memfill32_asm_mips_dsp; - #endif // Q_PROCESSOR_MIPS_32 - --- -1.7.1 - -- cgit v1.2.3