summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch
diff options
context:
space:
mode:
authorPeter Seiderer <ps.report@gmx.net>2016-06-24 20:02:01 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-06-25 15:37:33 +0200
commit9a55b996651fdfbc40e202cb4dd725dce624ca91 (patch)
tree79f90e7ffbd974feed2f2b305bb5740251741b8a /package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch
parentc6ba80ccae02fc8e26f6716480c200ed35efa9d6 (diff)
downloadbuildroot-9a55b996651fdfbc40e202cb4dd725dce624ca91.tar.gz
buildroot-9a55b996651fdfbc40e202cb4dd725dce624ca91.zip
qt5: bump version to 5.6.1-1
Removed obsolete patches: - qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch (upstream committed [1]) - qt5/qt5base/0007-build-with-explicitlib-after-all.patch (upstream committed [2]) - qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch (fixed upstream by [3]) - qt5webkit/0004-Fix-linking-with-libpthread.patch (upstream committed [4]) [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=e69e69519661954716d59bfa5bbd0626515cfda9 [2] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=523c7e3fd55c853dd424d57f28e225d57439cf89 [3] http://code.qt.io/cgit/qt/qttools.git/commit/?id=2b262fad86ef38a5fa692b4c73e6ec26a5d45a5f [4] http://code.qt.io/cgit/qt/qtwebkit.git/commit/?id=5f359baacdf92fabcece83f0a2b30f74c7c02a3c Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch')
-rw-r--r--package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch b/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch
deleted file mode 100644
index 61cbdfe6a1..0000000000
--- a/package/qt5/qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From acdb24783322bb6e69df61cf04df2b2e47a06ad2 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Tue, 29 Mar 2016 13:37:09 +0200
-Subject: [PATCH] Disable qdoc (needs qtdeclarative).
-
-Fixes:
-
- Project ERROR: Unknown module(s) in QT: qmldevtools-private
- Makefile:63: recipe for target 'sub-qdoc-qmake_all' failed
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- src/src.pro | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/src.pro b/src/src.pro
-index 387d54f..494898f 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -14,7 +14,6 @@ qtHaveModule(widgets) {
- }
-
- SUBDIRS += linguist \
-- qdoc \
- qtplugininfo
- if(!android|android_app):!ios: SUBDIRS += qtpaths
-
---
-2.1.4
-
OpenPOWER on IntegriCloud