diff options
Diffstat (limited to 'package/qt5')
| -rw-r--r-- | package/qt5/qt5base/Config.in | 22 | ||||
| -rw-r--r-- | package/qt5/qt5webkit/0001-egl-includepath.patch (renamed from package/qt5/qt5webkit/qt5webkit-0001-egl-includepath.patch) | 0 | ||||
| -rw-r--r-- | package/qt5/qt5webkit/0002-Fix-build-failure-with-python3.patch | 31 |
3 files changed, 37 insertions, 16 deletions
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index f4eedec1fd..6ea7301a9d 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -37,9 +37,7 @@ config BR2_PACKAGE_QT5BASE_EXAMPLES If unsure, say N. config BR2_PACKAGE_QT5BASE_NETWORK - bool "network module" - help - This options enables the Qt5Network library. + def_bool y config BR2_PACKAGE_QT5BASE_CONCURRENT bool "concurrent module" @@ -47,9 +45,7 @@ config BR2_PACKAGE_QT5BASE_CONCURRENT This options enables the Qt5Concurrent library. config BR2_PACKAGE_QT5BASE_SQL - bool "sql module" - help - This options enables the Qt5Sql library. + def_bool y if BR2_PACKAGE_QT5BASE_SQL config BR2_PACKAGE_QT5BASE_MYSQL @@ -101,14 +97,10 @@ endchoice endif config BR2_PACKAGE_QT5BASE_TEST - bool "test module" - help - This options enables the Qt5Test library. + def_bool y config BR2_PACKAGE_QT5BASE_XML - bool "XML module" - help - This options enables the Qt5Xml library. + def_bool y config BR2_PACKAGE_QT5BASE_GUI bool "gui module" @@ -209,10 +201,8 @@ config BR2_PACKAGE_QT5BASE_DEFAULT_QPA different platform at runtime with the -platform option. config BR2_PACKAGE_QT5BASE_PRINTSUPPORT - bool "print support module" - select BR2_PACKAGE_QT5BASE_WIDGETS - help - This option enables the Qt5PrintSupport + depends on BR2_PACKAGE_QT5BASE_WIDGETS + def_bool y config BR2_PACKAGE_QT5BASE_FONTCONFIG bool "fontconfig support" diff --git a/package/qt5/qt5webkit/qt5webkit-0001-egl-includepath.patch b/package/qt5/qt5webkit/0001-egl-includepath.patch index de5bcff0d3..de5bcff0d3 100644 --- a/package/qt5/qt5webkit/qt5webkit-0001-egl-includepath.patch +++ b/package/qt5/qt5webkit/0001-egl-includepath.patch diff --git a/package/qt5/qt5webkit/0002-Fix-build-failure-with-python3.patch b/package/qt5/qt5webkit/0002-Fix-build-failure-with-python3.patch new file mode 100644 index 0000000000..dc0854ea61 --- /dev/null +++ b/package/qt5/qt5webkit/0002-Fix-build-failure-with-python3.patch @@ -0,0 +1,31 @@ +Fetched from: https://codereview.qt-project.org/#/c/99784/ + +From e9d00f6279f9cfefc5a3144d5953bb7934aed418 Mon Sep 17 00:00:00 2001 +From: Samuel Martin <s.martin49@gmail.com> +Date: Thu, 13 Nov 2014 15:29:38 +0100 +Subject: [PATCH] Fix build failure with python3 + +Task-number: QTBUG-33692 +Change-Id: I7a3bc6217110ce3a0bf5fee4b3b675dee39d8ac5 + +Signed-off-by: Samuel Martin <s.martin49@gmail.com> +--- + Source/JavaScriptCore/disassembler/udis86/itab.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/disassembler/udis86/itab.py b/Source/JavaScriptCore/disassembler/udis86/itab.py +index 3d50ad0..90bd3e0 100644 +--- a/Source/JavaScriptCore/disassembler/udis86/itab.py ++++ b/Source/JavaScriptCore/disassembler/udis86/itab.py +@@ -314,7 +314,7 @@ class UdItabGenerator( ud_opcode.UdOpcodeTables ): + self.ItabH.write( "\n" ) + + self.ItabH.write("\n/* itab entry operand definitions */\n"); +- operands = self.OperandDict.keys() ++ operands = list( self.OperandDict.keys() ) + operands.sort() + for o in operands: + self.ItabH.write("#define O_%-7s { %-12s %-8s }\n" % +-- +2.1.3 + |
