[Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option

[Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option

[Peter Korsgaard]

The gr-qtgui option uses python-pyqt/Qt4, which we are about to remove, so
remove the option.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy             |  6 ++++++
 package/gnuradio/Config.in   | 10 ----------
 package/gnuradio/gnuradio.mk | 10 ++--------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index be2f722b05..c84a9239a7 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_GNURADIO_QTGUI
+	bool "gnuradio gr-qtgui option removed"
+	select BR2_LEGACY
+	help
+	  The gr-qtgui option was removed.
+
 config BR2_PACKAGE_LUACRYPTO
 	bool "luacrypto package removed"
 	select BR2_LEGACY
diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index 533a49c81e..3fdaea850e 100644
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -116,16 +116,6 @@ config BR2_PACKAGE_GNURADIO_PAGER
 	help
 	  FLEX pager decoder implementation blocks
 
-config BR2_PACKAGE_GNURADIO_QTGUI
-	bool "gr-qtgui"
-	depends on BR2_PACKAGE_PYTHON_PYQT
-	depends on BR2_PACKAGE_QWT
-	depends on BR2_PACKAGE_QT_STL
-	select BR2_PACKAGE_GNURADIO_FFT
-	select BR2_PACKAGE_GNURADIO_FILTER
-	help
-	  GNU Radio Qt scopes
-
 config BR2_PACKAGE_GNURADIO_TRELLIS
 	bool "gr-trellis support"
 	select BR2_PACKAGE_GNURADIO_DIGITAL
diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
index 564ad8b2a4..d6d07f6566 100644
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -25,7 +25,8 @@ endif
 GNURADIO_CONF_OPTS = \
 	-DENABLE_DEFAULT=OFF \
 	-DENABLE_VOLK=ON \
-	-DENABLE_GNURADIO_RUNTIME=ON
+	-DENABLE_GNURADIO_RUNTIME=ON \
+	-DENABLE_GR_QTGUI=OFF
 
 # For third-party blocks, the gnuradio libraries are mandatory at
 # compile time.
@@ -126,13 +127,6 @@ else
 GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y)
-GNURADIO_DEPENDENCIES += python-pyqt qwt
-GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON
-else
-GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y)
 GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON
 else
-- 
2.11.0

[Buildroot] [PATCH 02/16] package/python-pyqt: remove package

[Peter Korsgaard]

The python-pyqt package uses the obsolete qt4 package, which we are about to
remove, so remove python-pyqt as well.

CC: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                                   |   7 ++
 DEVELOPERS                                         |   1 -
 package/Config.in                                  |   1 -
 .../python-pyqt/0001-configure-skip-qtdetail.patch |  29 ------
 package/python-pyqt/0002-configure-set-qws.patch   |  43 --------
 package/python-pyqt/0003-sip-add_qws.patch         |  44 --------
 ...004-sip-QtGuit-hide-qfont-cachestatistics.patch |  18 ----
 package/python-pyqt/0005-sip-fix_qws_handle.patch  |  24 -----
 package/python-pyqt/Config.in                      |  21 ----
 package/python-pyqt/python-pyqt.hash               |   5 -
 package/python-pyqt/python-pyqt.mk                 | 113 ---------------------
 11 files changed, 7 insertions(+), 299 deletions(-)
 delete mode 100644 package/python-pyqt/0001-configure-skip-qtdetail.patch
 delete mode 100644 package/python-pyqt/0002-configure-set-qws.patch
 delete mode 100644 package/python-pyqt/0003-sip-add_qws.patch
 delete mode 100644 package/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch
 delete mode 100644 package/python-pyqt/0005-sip-fix_qws_handle.patch
 delete mode 100644 package/python-pyqt/Config.in
 delete mode 100644 package/python-pyqt/python-pyqt.hash
 delete mode 100644 package/python-pyqt/python-pyqt.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index c84a9239a7..5a330cada9 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_PYTHON_PYQT
+	bool "python-pyqt package removed"
+	select BR2_LEGACY
+	help
+	  The python-pyqt package was removed. Consider python-pyqt5
+	  instead.
+
 config BR2_PACKAGE_GNURADIO_QTGUI
 	bool "gnuradio gr-qtgui option removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 1f3cc6a888..7ba6377db6 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -940,7 +940,6 @@ F:	package/gr-osmosdr/
 F:	package/libusbgx/
 F:	package/python-cheetah/
 F:	package/python-markdown/
-F:	package/python-pyqt/
 F:	package/python-remi/
 F:	package/python-sip/
 
diff --git a/package/Config.in b/package/Config.in
index ebba7b4df2..9907221b68 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -989,7 +989,6 @@ menu "External python modules"
 	source "package/python-pyparted/Config.in"
 	source "package/python-pypcap/Config.in"
 	source "package/python-pyqrcode/Config.in"
-	source "package/python-pyqt/Config.in"
 	source "package/python-pyqt5/Config.in"
 	source "package/python-pyratemp/Config.in"
 	source "package/python-pyro/Config.in"
diff --git a/package/python-pyqt/0001-configure-skip-qtdetail.patch b/package/python-pyqt/0001-configure-skip-qtdetail.patch
deleted file mode 100644
index 08e99d026c..0000000000
--- a/package/python-pyqt/0001-configure-skip-qtdetail.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Do not run qtdetail
-
-qtdetail is a tool that generates qtdetail.out. Since this program is
-cross-compiled, it's not possible to run it on the host.
-
-Consequently, python-pyqt.mk generates the qtdetail.out file before
-calling configure-ng.py.
-
-Therefore, this patch makes sure that the pre-generated qtdetail.out
-file is kept, and that qtdetail is not executed.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
-Signed-off-by: Sergey Kostanbaev <sergey.kostanbaev@gmail.com>
----
-Index: PyQt-x11-gpl-4.11.3/configure-ng.py
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/configure-ng.py
-+++ PyQt-x11-gpl-4.11.3/configure-ng.py
-@@ -672,10 +672,6 @@ int main(int argc, char **argv)
-         if cmd is None:
-             error("Failed to determine the detail of your Qt installation. Try again using the --verbose flag to see more detail about the problem.")
- 
--        # Create the output file, first making sure it doesn't exist.
--        remove_file(out_file)
--        run_command(cmd, verbose)
--
-         if not os.access(out_file, os.F_OK):
-             error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file))
- 
diff --git a/package/python-pyqt/0002-configure-set-qws.patch b/package/python-pyqt/0002-configure-set-qws.patch
deleted file mode 100644
index 33a5648bee..0000000000
--- a/package/python-pyqt/0002-configure-set-qws.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Add support for several Qt flavors
-
-Qt has two flavors: X11 and embedded (QWS). QWS has some limitations
-compared to X11. This patch adds an option to select which version to
-use.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
----
-Index: PyQt-x11-gpl-4.11.3/configure-ng.py
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/configure-ng.py
-+++ PyQt-x11-gpl-4.11.3/configure-ng.py
-@@ -960,6 +960,9 @@ int main(int argc, char **argv)
-         if opts.vendlibdir is not None:
-             self.vend_lib_dir = opts.vendlibdir
- 
-+        if opts.qtflavor is not None:
-+            self.qt_flavor = opts.qtflavor
-+
-         # Handle any conflicts.
-         if self.qt_shared:
-             if len(self.static_plugins) != 0:
-@@ -1177,6 +1180,11 @@ def create_optparser(target_config):
-             dest="notools",
-             help="disable the building of pyuic5, pyrcc5 and pylupdate5 "
-                     "[default: enabled]")
-+    g.add_option("--qt-flavor", dest='qtflavor', type='string',
-+            default="WS_X11", metavar='QTFLAVOR', action='store',
-+            help="select Qt flavor beetween WS_X11 and WS_QWS "
-+                    "only available on Linux)"
-+                    "[default: WS_X11]")
-     p.add_option_group(g)
- 
-     # Vendor ID.
-@@ -2088,7 +2096,7 @@ def get_sip_flags(target_config):
-     elif target_config.py_platform == 'darwin':
-         plattag = 'WS_MACX'
-     else:
--        plattag = 'WS_X11'
-+        plattag = target_config.qt_flavor
- 
-     sip_flags.append('-t')
-     sip_flags.append(plattag)
diff --git a/package/python-pyqt/0003-sip-add_qws.patch b/package/python-pyqt/0003-sip-add_qws.patch
deleted file mode 100644
index 1ff706f624..0000000000
--- a/package/python-pyqt/0003-sip-add_qws.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Add WS_QWS in the Platforms variable and to define some types
-
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
-Signed-off-by: Sergey Kostanbaev <sergey.kostanbaev@gmail.com>
----
-Index: PyQt-x11-gpl-4.11.3/sip/QtCore/QtCoremod.sip
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/QtCoremod.sip
-+++ PyQt-x11-gpl-4.11.3/sip/QtCore/QtCoremod.sip
-@@ -29,7 +29,7 @@
- 
- %Timeline {Qt_4_1_0 Qt_4_1_1 Qt_4_1_2 Qt_4_1_3 Qt_4_2_0 Qt_4_2_1 Qt_4_2_2 Qt_4_2_3 Qt_4_3_0 Qt_4_3_1 Qt_4_3_2 Qt_4_3_3 Qt_4_3_4 Qt_4_4_0 Qt_4_4_1 Qt_4_4_2 Qt_4_5_0 Qt_4_5_1 Qt_4_5_2 Qt_4_5_3 Qt_4_6_0 Qt_4_6_1 Qt_4_6_2 Qt_4_6_3 Qt_4_7_0 Qt_4_7_1 Qt_4_7_2 Qt_4_7_3 Qt_4_7_4 Qt_4_8_0 Qt_4_8_1 Qt_4_8_2 Qt_4_8_3 Qt_4_8_4 Qt_4_8_5 Qt_4_8_6 Qt_5_0_0}
- 
--%Platforms {WS_X11 WS_WIN WS_MACX}
-+%Platforms {WS_X11 WS_QWS WS_WIN WS_MACX}
- 
- %Feature PyQt_Accessibility
- %Feature PyQt_SessionManager
-Index: PyQt-x11-gpl-4.11.3/sip/QtCore/qprocess.sip
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/qprocess.sip
-+++ PyQt-x11-gpl-4.11.3/sip/QtCore/qprocess.sip
-@@ -28,7 +28,7 @@
- %If (WS_WIN)
- typedef void *Q_PID;
- %End
--%If (WS_X11 || WS_MACX)
-+%If (WS_X11 || WS_QWS || WS_MACX)
- typedef qint64 Q_PID;
- %End
- 
-Index: PyQt-x11-gpl-4.11.3/sip/QtGui/qwindowdefs.sip
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/sip/QtGui/qwindowdefs.sip
-+++ PyQt-x11-gpl-4.11.3/sip/QtGui/qwindowdefs.sip
-@@ -27,7 +27,7 @@
- 
- typedef QList<QWidget*> QWidgetList;
- %If (- Qt_5_0_0)
--%If (WS_X11)
-+%If (WS_X11 || WS_QWS)
- // X11 specific definitions.
- typedef unsigned long WId;
- %End
diff --git a/package/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch b/package/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch
deleted file mode 100644
index c07bea777f..0000000000
--- a/package/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Hide QFont::cacheStatistics which isn't available in QWS
-
-Signed-off-by: Sergey Kostanbaev <sergey.kostanbaev@gmail.com>
----
-
-diff -ur PyQt-x11-gpl-4.9.6/sip/QtGui/qfont.sip pyqt-4.9.6/sip/QtGui/qfont.sip
---- PyQt-x11-gpl-4.9.6/sip/QtGui/qfont.sip	2012-12-08 13:51:38.000000000 +0400
-+++ pyqt-4.9.6/sip/QtGui/qfont.sip	2013-05-22 14:06:38.335000022 +0400
-@@ -185,7 +185,9 @@
- %End
-     static void initialize();
-     static void cleanup();
-+%If (!WS_QWS)
-     static void cacheStatistics();
-+%End
-     QString defaultFamily() const;
-     QString lastResortFamily() const;
-     QString lastResortFont() const;
diff --git a/package/python-pyqt/0005-sip-fix_qws_handle.patch b/package/python-pyqt/0005-sip-fix_qws_handle.patch
deleted file mode 100644
index 80623d112a..0000000000
--- a/package/python-pyqt/0005-sip-fix_qws_handle.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix build issue in QWS flavor
-
-Change HANDLE to void* to get rid of :
-buildroot/output/build/python-pyqt-4.11.3/QtCore/sipQtCoreQThread.cpp:318:50:
-error: invalid conversion from 'Qt::HANDLE {aka void*}' to 'long
-unsigned int' [-fpermissive] error during compilation.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
-Signed-off-by: Sergey Kostanbaev <sergey.kostanbaev@gmail.com>
----
-Index: PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip
-===================================================================
---- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/qnamespace.sip
-+++ PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip
-@@ -1673,6 +1673,9 @@ namespace Qt
- %If (WS_X11)
-     typedef unsigned long HANDLE;
- %End
-+%If (WS_QWS)
-+    typedef void* HANDLE;
-+%End
- %End
- %If (PyQt_Deprecated_5_0)
-     typedef Qt::WindowFlags WFlags;
diff --git a/package/python-pyqt/Config.in b/package/python-pyqt/Config.in
deleted file mode 100644
index 6934a4c4ab..0000000000
--- a/package/python-pyqt/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-comment "python-pyqt needs Qt4"
-	depends on !BR2_PACKAGE_QT
-
-config BR2_PACKAGE_PYTHON_PYQT
-	bool "python-pyqt"
-	depends on BR2_PACKAGE_QT
-	select BR2_PACKAGE_PYTHON_SIP
-	help
-	  PyQt4 for Qt Embedded 4 bindings.
-
-	  http://www.riverbankcomputing.com/software/pyqt/
-
-if BR2_PACKAGE_PYTHON_PYQT
-
-config BR2_PACKAGE_PYTHON_PYQT_ARCH_USES_QREAL_FLOAT
-	bool
-	default y if BR2_arm || BR2_armeb
-	default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb
-	default y if (BR2_mipsel || BR2_mips) && BR2_PACKAGE_QT_EMBEDDED
-
-endif
diff --git a/package/python-pyqt/python-pyqt.hash b/package/python-pyqt/python-pyqt.hash
deleted file mode 100644
index 1709b66ab8..0000000000
--- a/package/python-pyqt/python-pyqt.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# From http://http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.3/
-md5 997c3e443165a89a559e0d96b061bf70 PyQt-x11-gpl-4.11.3.tar.gz
-
-# Locally calculated:
-sha256 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686 PyQt-x11-gpl-4.11.3.tar.gz
diff --git a/package/python-pyqt/python-pyqt.mk b/package/python-pyqt/python-pyqt.mk
deleted file mode 100644
index e8ae641662..0000000000
--- a/package/python-pyqt/python-pyqt.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-################################################################################
-#
-# python-pyqt
-#
-################################################################################
-
-PYTHON_PYQT_VERSION = 4.11.3
-PYTHON_PYQT_SOURCE = PyQt-x11-gpl-$(PYTHON_PYQT_VERSION).tar.gz
-PYTHON_PYQT_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt4/PyQt-$(PYTHON_PYQT_VERSION)
-PYTHON_PYQT_LICENSE = GPL-2.0 or GPL-3.0
-PYTHON_PYQT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3
-
-PYTHON_PYQT_DEPENDENCIES = python-sip host-python-sip qt
-
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_PYQT_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR)
-PYTHON_PYQT_RM_PORT_BASE = port_v3
-else ifeq ($(BR2_PACKAGE_PYTHON3),y)
-PYTHON_PYQT_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR)
-PYTHON_PYQT_RM_PORT_BASE = port_v2
-endif
-
-ifeq ($(BR2_PACKAGE_QT_EMBEDDED),y)
-PYTHON_PYQT_QTFLAVOR = WS_QWS
-else
-PYTHON_PYQT_QTFLAVOR = WS_X11
-endif
-
-PYTHON_PYQT_QTDETAIL_LICENSE = Open Source
-
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-PYTHON_PYQT_QTDETAIL_TYPE = shared
-endif
-
-# Turn off features that aren't available in QWS and current qt
-# configuration.
-PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES = \
-	PyQt_Accessibility PyQt_SessionManager \
-	PyQt_Shortcut PyQt_RawFont
-
-ifeq ($(BR2_PACKAGE_QT_OPENSSL),)
-PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_OpenSSL
-endif
-
-# Yes, this looks a bit weird: when OpenGL ES is available, we have to
-# disable the feature that consists in not having OpenGL ES support.
-ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
-PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_NoOpenGLES
-endif
-
-# PyQt_qreal_double must be disabled on a number of architectures that
-# use float for qreal.
-ifeq ($(BR2_PACKAGE_PYTHON_PYQT_ARCH_USES_QREAL_FLOAT),y)
-PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_qreal_double
-endif
-
-define PYTHON_PYQT_QTDETAIL
-	echo $(1) >> $(2)/qtdetail.out
-endef
-
-# Since we can't run generate qtdetail.out by running qtdetail on target device
-# we must generate the configuration.
-define PYTHON_PYQT_GENERATE_QTDETAIL
-	$(RM) -f $(1)/qtdetail.out
-	$(call PYTHON_PYQT_QTDETAIL,$(PYTHON_PYQT_QTDETAIL_LICENSE),$(1))
-	$(call PYTHON_PYQT_QTDETAIL,$(PYTHON_PYQT_QTDETAIL_TYPE),$(1))
-	$(foreach f,$(PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES),
-		$(call PYTHON_PYQT_QTDETAIL,$(f),$(1)) \
-	)
-endef
-
-PYTHON_PYQT_CONF_OPTS = \
-	--bindir $(TARGET_DIR)/usr/bin \
-	--destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages \
-	--qmake $(HOST_DIR)/bin/qmake \
-	--sysroot $(STAGING_DIR)/usr \
-	-w --confirm-license \
-	--no-designer-plugin \
-	--no-docstrings \
-	--no-sip-files \
-	--qt-flavor=$(PYTHON_PYQT_QTFLAVOR)
-
-# The VendorID related information is only needed for Python 2.x, not
-# Python 3.x.
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-PYTHON_PYQT_CONF_OPTS += \
-	--vendorid-incdir $(STAGING_DIR)/usr/include/$(PYTHON_PYQT_PYTHON_DIR) \
-	--vendorid-libdir $(STAGING_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/config
-endif
-
-define PYTHON_PYQT_CONFIGURE_CMDS
-	$(call PYTHON_PYQT_GENERATE_QTDETAIL,$(@D))
-	(cd $(@D); \
-		$(TARGET_MAKE_ENV) \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(HOST_DIR)/bin/python configure-ng.py \
-			$(PYTHON_PYQT_CONF_OPTS) \
-	)
-endef
-
-define PYTHON_PYQT_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
-endef
-
-# __init__.py is needed to import PyQt4
-# __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set
-define PYTHON_PYQT_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install
-	touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/__init__.py
-	$(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/uic/$(PYTHON_PYQT_RM_PORT_BASE)
-endef
-
-$(eval $(generic-package))
-- 
2.11.0

[Buildroot] [PATCH 03/16] package/python-sip: remove qt4 support

[Peter Korsgaard]

python-pyqt has been removed and qt4 support is about to be dropped, so
remove the support from python-sip as well.

Adjust the dependencies to match the dependencies of qt5, and ensure that
qt5base is selected.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/python-sip/Config.in     | 14 ++++++++------
 package/python-sip/python-sip.mk |  4 ----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/package/python-sip/Config.in b/package/python-sip/Config.in
index 1f8961d0df..4ce4f89b2a 100644
--- a/package/python-sip/Config.in
+++ b/package/python-sip/Config.in
@@ -2,17 +2,19 @@ comment "python-sip needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
-comment "python-sip needs qt or qt5"
+comment "python-sip needs qt5"
 	depends on BR2_USE_MMU
 	depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
+	depends on !BR2_PACKAGE_QT5
 
 config BR2_PACKAGE_PYTHON_SIP
 	bool "python-sip"
-	depends on BR2_INSTALL_LIBSTDCPP # qt
-	depends on BR2_TOOLCHAIN_HAS_THREADS # qt
-	depends on BR2_USE_MMU # qt
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+	depends on BR2_INSTALL_LIBSTDCPP # qt5
+	depends on BR2_USE_WCHAR # qt5
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5
+	depends on !BR2_STATIC_LIBS # qt5
+	depends on BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE
 	help
 	  SIP is a tool that makes it very easy to create Python
 	  bindings for C and C++ libraries. It was originally
diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk
index 76d7d04187..69019f5f19 100644
--- a/package/python-sip/python-sip.mk
+++ b/package/python-sip/python-sip.mk
@@ -10,11 +10,7 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON
 PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0
 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3
 
-ifeq ($(BR2_PACKAGE_QT5),y)
 PYTHON_SIP_DEPENDENCIES = qt5base
-else
-PYTHON_SIP_DEPENDENCIES = qt
-endif
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 PYTHON_SIP_DEPENDENCIES += python
-- 
2.11.0

[Buildroot] [PATCH 04/16] package/sdl: remove qtopia video driver option

[Peter Korsgaard]

The qtopia option uses the obsolete qt4 package, which we are about to
remove, to remove the qtopia option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy      | 6 ++++++
 package/sdl/Config.in | 4 ----
 package/sdl/sdl.mk    | 5 -----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 5a330cada9..0eb69361cc 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_SDL_QTOPIA
+	bool "sdl qtopia video driver option removed"
+	select BR2_LEGACY
+	help
+	  The SDL QTopia video driver option was removed.
+
 config BR2_PACKAGE_PYTHON_PYQT
 	bool "python-pyqt package removed"
 	select BR2_LEGACY
diff --git a/package/sdl/Config.in b/package/sdl/Config.in
index 65ac8a2469..9f1e34de5c 100644
--- a/package/sdl/Config.in
+++ b/package/sdl/Config.in
@@ -17,10 +17,6 @@ config BR2_PACKAGE_SDL_DIRECTFB
 	bool "SDL DirectFB video driver"
 	depends on BR2_PACKAGE_DIRECTFB
 
-config BR2_PACKAGE_SDL_QTOPIA
-	bool "SDL Qtopia video driver"
-	depends on BR2_PACKAGE_QT
-
 config BR2_PACKAGE_SDL_X11
 	bool "SDL X11 video driver"
 	depends on BR2_PACKAGE_XORG7
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 0a6a7de139..d8b3733e4a 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -37,12 +37,7 @@ else
 SDL_CONF_OPTS += --enable-video-directfb=no
 endif
 
-ifeq ($(BR2_PACKAGE_SDL_QTOPIA),y)
-SDL_CONF_OPTS += --enable-video-qtopia=yes
-SDL_DEPENDENCIES += qt
-else
 SDL_CONF_OPTS += --enable-video-qtopia=no
-endif
 
 ifeq ($(BR2_PACKAGE_SDL_X11),y)
 SDL_CONF_OPTS += --enable-video-x11=yes
-- 
2.11.0

[Buildroot] [PATCH 05/16] package/amd-catalyst: remove control center option

[Peter Korsgaard]

The control center option uses the obsolete qt4 package, which we are about
to remove, so remote the cccle option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                     |  6 ++++++
 package/amd-catalyst/Config.in       | 16 ----------------
 package/amd-catalyst/amd-catalyst.mk | 10 ----------
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 0eb69361cc..dbd7450741 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_AMD_CATALYST_CCCLE
+	bool "catalyst control center option removed"
+	select BR2_LEGACY
+	help
+	  The AMD Catalyst Control Center option was removed.
+
 config BR2_PACKAGE_SDL_QTOPIA
 	bool "sdl qtopia video driver option removed"
 	select BR2_LEGACY
diff --git a/package/amd-catalyst/Config.in b/package/amd-catalyst/Config.in
index 85551ed803..1a5bf02953 100644
--- a/package/amd-catalyst/Config.in
+++ b/package/amd-catalyst/Config.in
@@ -45,22 +45,6 @@ config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS
 	help
 	  Build and install the AMD command line tools.
 
-comment "Catalyst Control Center needs Qt4 with X11 and PNG support"
-	depends on !BR2_PACKAGE_QT || !BR2_PACKAGE_QT_X11 \
-		|| BR2_PACKAGE_QT_NOPNG
-
-config BR2_PACKAGE_AMD_CATALYST_CCCLE
-	bool "Catalyst Control Center"
-	depends on BR2_PACKAGE_QT
-	depends on BR2_PACKAGE_QT_X11
-	depends on !BR2_PACKAGE_QT_NOPNG
-	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng
-	select BR2_PACKAGE_PROCPS_NG # runtime
-	select BR2_PACKAGE_QT_ACCESSIBILITY
-	help
-	  Installs the Catalyst Control Center, a Qt graphical tool to
-	  control AMD graphics accelerators.
-
 endif
 
 comment "amd-catalyst kernel module needs a kernel to be built"
diff --git a/package/amd-catalyst/amd-catalyst.mk b/package/amd-catalyst/amd-catalyst.mk
index d864095c31..fe8aa850f0 100644
--- a/package/amd-catalyst/amd-catalyst.mk
+++ b/package/amd-catalyst/amd-catalyst.mk
@@ -149,15 +149,6 @@ define  AMD_CATALYST_INSTALL_CMDLINE_TOOLS
 endef
 endif
 
-ifeq ($(BR2_PACKAGE_AMD_CATALYST_CCCLE), y)
-define AMD_CATALYST_INSTALL_CCCLE
-	$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/amdcccle \
-		$(TARGET_DIR)/usr/bin/amdcccle
-	$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/amdnotifyui \
-		$(TARGET_DIR)/usr/sbin/amdnotifyui
-endef
-endif
-
 define AMD_CATALYST_INSTALL_STAGING_CMDS
 	$(call AMD_CATALYST_INSTALL_STAGING_XORG)
 endef
@@ -165,7 +156,6 @@ endef
 define AMD_CATALYST_INSTALL_TARGET_CMDS
 	$(call AMD_CATALYST_INSTALL_XORG)
 	$(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS)
-	$(call AMD_CATALYST_INSTALL_CCCLE)
 	$(call AMD_CATALYST_INSTALL_OPENCL)
 endef
 
-- 
2.11.0

[Buildroot] [PATCH 06/16] package/opencv: remove qt backend option

[Peter Korsgaard]

The qt backend option uses the obsolete qt4 package, which we are about to
remove, so remove the qt backend option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy         |  6 ++++++
 package/opencv/Config.in | 12 ------------
 package/opencv/opencv.mk |  8 +-------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index dbd7450741..cdf5f989b5 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_OPENCV_WITH_QT
+	bool "opencv qt backend option removed"
+	select BR2_LEGACY
+	help
+	  The opencv qt backend option was removed.
+
 config BR2_PACKAGE_AMD_CATALYST_CCCLE
 	bool "catalyst control center option removed"
 	select BR2_LEGACY
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index b7c8c41682..54094b29ca 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -266,18 +266,6 @@ config BR2_PACKAGE_OPENCV_WITH_PNG
 	help
 	  Use shared libpng from the target system.
 
-config BR2_PACKAGE_OPENCV_WITH_QT
-	bool "qt backend support"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_MMU # qt
-	depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI
-	select BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT_STL
-	select BR2_PACKAGE_QT_GUI_MODULE
-	select BR2_PACKAGE_QT_TEST
-	help
-	  Use Qt with QtTest module and STL support
-
 config BR2_PACKAGE_OPENCV_WITH_TIFF
 	bool "tiff support"
 	select BR2_PACKAGE_TIFF
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index d9813a041d..ccc2d820da 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -160,6 +160,7 @@ OPENCV_CONF_OPTS += \
 	-DWITH_OPENGL=OFF \
 	-DWITH_OPENMP=OFF \
 	-DWITH_OPENNI=OFF \
+	-DWITH_QT=OFF \
 	-DWITH_UNICAP=OFF \
 	-DWITH_XINE=OFF
 
@@ -215,13 +216,6 @@ else
 OPENCV_CONF_OPTS += -DWITH_PNG=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y)
-OPENCV_CONF_OPTS += -DWITH_QT=4
-OPENCV_DEPENDENCIES += qt
-else
-OPENCV_CONF_OPTS += -DWITH_QT=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y)
 OPENCV_CONF_OPTS += -DWITH_TIFF=ON
 OPENCV_DEPENDENCIES += tiff
-- 
2.11.0

[Buildroot] [PATCH 07/16] package/opencv3: remove qt backend option

[Peter Korsgaard]

The qt backend option uses the obsolete qt4 package, which we are about to
remove, so remove the qt backend option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy           |  6 ++++++
 package/opencv3/Config.in  | 16 +---------------
 package/opencv3/opencv3.mk | 11 ++---------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index cdf5f989b5..67e3b0dc70 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_OPENCV3_WITH_QT
+	bool "opencv3 qt backend option removed"
+	select BR2_LEGACY
+	help
+	  The opencv3 qt backend option was removed.
+
 config BR2_PACKAGE_OPENCV_WITH_QT
 	bool "opencv qt backend option removed"
 	select BR2_LEGACY
diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
index 80a297a904..61405a7c64 100644
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -82,20 +82,6 @@ comment "gtk3 support needs libgtk3"
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_PACKAGE_LIBGTK3
 
-config BR2_PACKAGE_OPENCV3_WITH_QT
-	bool "qt4"
-	depends on BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT_STL
-	select BR2_PACKAGE_QT_GUI_MODULE
-	select BR2_PACKAGE_QT_TEST
-	help
-	  Use Qt4 with QtTest and QtGui modules and STL support, as
-	  GUI toolkit.
-
-comment "qt4 support needs qt"
-	depends on BR2_USE_MMU # qt
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
-
 config BR2_PACKAGE_OPENCV3_WITH_QT5
 	bool "qt5"
 	depends on BR2_PACKAGE_QT5
@@ -108,7 +94,7 @@ config BR2_PACKAGE_OPENCV3_WITH_QT5
 	  components, as GUI toolkit.
 
 comment "qt5 support needs qt5"
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
+	depends on !BR2_PACKAGE_QT5
 
 endchoice
 
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
index 978f38c143..3a2594b584 100644
--- a/package/opencv3/opencv3.mk
+++ b/package/opencv3/opencv3.mk
@@ -288,18 +288,11 @@ else
 OPENCV3_CONF_OPTS += -DWITH_PNG=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT)$(BR2_PACKAGE_OPENCV3_WITH_QT5),)
-OPENCV3_CONF_OPTS += -DWITH_QT=OFF
-endif
-
-ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT),y)
-OPENCV3_CONF_OPTS += -DWITH_QT=4
-OPENCV3_DEPENDENCIES += qt
-endif
-
 ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)
 OPENCV3_CONF_OPTS += -DWITH_QT=5
 OPENCV3_DEPENDENCIES += qt5base
+else
+OPENCV3_CONF_OPTS += -DWITH_QT=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_OPENCV3_WITH_TIFF),y)
-- 
2.11.0

[Buildroot] [PATCH 08/16] package/poppler: remove qt option

[Peter Korsgaard]

The qt option uses the obsolete qt4 package, which we are about to remove,
so remove the poppler qt option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy           | 6 ++++++
 package/poppler/Config.in  | 8 --------
 package/poppler/poppler.mk | 9 +--------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 67e3b0dc70..c137006948 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_POPPLER_QT
+	bool "poppler qt option removed"
+	select BR2_LEGACY
+	help
+	  The poppler qt option was removed.
+
 config BR2_PACKAGE_OPENCV3_WITH_QT
 	bool "opencv3 qt backend option removed"
 	select BR2_LEGACY
diff --git a/package/poppler/Config.in b/package/poppler/Config.in
index 9b03df8d27..4a553df721 100644
--- a/package/poppler/Config.in
+++ b/package/poppler/Config.in
@@ -13,14 +13,6 @@ config BR2_PACKAGE_POPPLER
 
 if BR2_PACKAGE_POPPLER
 
-config BR2_PACKAGE_POPPLER_QT
-	bool "Qt support"
-	depends on BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT_GUI_MODULE
-	select BR2_PACKAGE_QT_XML
-	help
-	  Build Qt support into the Poppler library
-
 config BR2_PACKAGE_POPPLER_QT5
 	bool "Qt5 support"
 	depends on BR2_PACKAGE_QT5
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index bad61a6613..be1c0e4821 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -12,7 +12,7 @@ POPPLER_LICENSE = GPL-2.0+
 POPPLER_LICENSE_FILES = COPYING
 POPPLER_INSTALL_STAGING = YES
 POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
-	--enable-xpdf-headers
+	--enable-xpdf-headers --disable-poppler-qt4
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic"
@@ -84,13 +84,6 @@ else
 POPPLER_CONF_OPTS += --without-x
 endif
 
-ifeq ($(BR2_PACKAGE_POPPLER_QT),y)
-POPPLER_DEPENDENCIES += qt
-POPPLER_CONF_OPTS += --enable-poppler-qt4
-else
-POPPLER_CONF_OPTS += --disable-poppler-qt4
-endif
-
 ifeq ($(BR2_PACKAGE_POPPLER_QT5),y)
 POPPLER_DEPENDENCIES += qt5base
 POPPLER_CONF_OPTS += --enable-poppler-qt5
-- 
2.11.0

[Buildroot] [PATCH 09/16] package/pinentry: remove qt4 option

[Peter Korsgaard]

The qt4 option uses the obsolete qt4 package, which we are about to remove,
so remove the pinentry-qt4 option as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy             |  6 ++++++
 package/pinentry/Config.in   | 18 ------------------
 package/pinentry/pinentry.mk | 11 +++--------
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index c137006948..64f5d58bd7 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_PINENTRY_QT4
+	bool "pinentry-qt4 option removed"
+	select BR2_LEGACY
+	help
+	  The pinentry-qt4 option was removed.
+
 config BR2_PACKAGE_POPPLER_QT
 	bool "poppler qt option removed"
 	select BR2_LEGACY
diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in
index 5f2cb58fbb..22bc2bb43d 100644
--- a/package/pinentry/Config.in
+++ b/package/pinentry/Config.in
@@ -7,7 +7,6 @@ menuconfig BR2_PACKAGE_PINENTRY
 	# At least one backend is needed to avoid build breakage
 	select BR2_PACKAGE_PINENTRY_NCURSES if \
 		!BR2_PACKAGE_PINENTRY_GTK2 && \
-		!BR2_PACKAGE_PINENTRY_QT4 && \
 		!BR2_PACKAGE_PINENTRY_QT5
 	help
 	  A collection of simple PIN or pass-phrase entry dialogs
@@ -42,28 +41,12 @@ comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++"
 	depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \
 		!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_PINENTRY_QT4
-	bool "pinentry-qt4"
-	depends on BR2_USE_MMU # fork
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  The pinentry-qt4 tool
-
-comment "pinentry-qt4 needs a toolchain w/ C++, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-
 config BR2_PACKAGE_PINENTRY_QT5
 	bool "pinentry-qt5"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS
-	depends on !BR2_PACKAGE_PINENTRY_QT4
-	depends on !BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5BASE_WIDGETS
@@ -71,7 +54,6 @@ config BR2_PACKAGE_PINENTRY_QT5
 	  The pinentry-qt5 tool
 
 comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
-	depends on !BR2_PACKAGE_PINENTRY_QT4
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 
diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
index d0179728bd..ce82f1090a 100644
--- a/package/pinentry/pinentry.mk
+++ b/package/pinentry/pinentry.mk
@@ -52,15 +52,10 @@ else
 PINENTRY_CONF_OPTS += --disable-pinentry-gtk2
 endif
 
-# pinentry-qt4/5 backend
-ifeq ($(BR2_PACKAGE_PINENTRY_QT4)$(BR2_PACKAGE_PINENTRY_QT5),y)
-ifeq ($(BR2_PACKAGE_PINENTRY_QT4),y)
-# -pthread needs to be passed for certain toolchains
-# http://autobuild.buildroot.net/results/6be/6be109ccedec603a67cebdb31b55865dcce0e128/
-PINENTRY_CONF_OPTS += LIBS=-pthread MOC=$(HOST_DIR)/bin/moc
-endif
+# pinentry-qt5 backend
+ifeq ($(BR2_PACKAGE_PINENTRY_QT5),y)
 PINENTRY_CONF_OPTS += --enable-pinentry-qt
-PINENTRY_DEPENDENCIES += $(if $(BR2_PACKAGE_PINENTRY_QT4),qt,qt5base)
+PINENTRY_DEPENDENCIES += qt5base
 else
 PINENTRY_CONF_OPTS += --disable-pinentry-qt
 endif
-- 
2.11.0

[Buildroot] [PATCH 10/16] package/qtuio: remove package

[Peter Korsgaard]

The qtuio package uses the obsolete qt4 package, which we are about to
remove, so remove qtuio as well.

CC: Stephan Hoffmann <sho@relinux.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                                   |  6 ++
 DEVELOPERS                                         |  1 -
 package/Config.in                                  |  1 -
 .../0001-TuioServer.cpp-add-missing-include.patch  | 28 ---------
 package/qtuio/0002-dont-append-_d-for-debug.patch  | 29 ---------
 package/qtuio/Config.in                            | 22 -------
 package/qtuio/qtuio.hash                           |  2 -
 package/qtuio/qtuio.mk                             | 72 ----------------------
 8 files changed, 6 insertions(+), 155 deletions(-)
 delete mode 100644 package/qtuio/0001-TuioServer.cpp-add-missing-include.patch
 delete mode 100644 package/qtuio/0002-dont-append-_d-for-debug.patch
 delete mode 100644 package/qtuio/Config.in
 delete mode 100644 package/qtuio/qtuio.hash
 delete mode 100644 package/qtuio/qtuio.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 64f5d58bd7..9c38abdc41 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_QTUIO
+	bool "qtuio package removed"
+	select BR2_LEGACY
+	help
+	  The qtuio package was removed.
+
 config BR2_PACKAGE_PINENTRY_QT4
 	bool "pinentry-qt4 option removed"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 7ba6377db6..070e40fdeb 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2014,7 +2014,6 @@ F:	package/cache-calibrator/
 F:	package/gtest/
 F:	package/mtdev/
 F:	package/mtdev2tuio/
-F:	package/qtuio/
 
 N:	Steve Calfee <stevecalfee@gmail.com>
 F:	package/python-pymysql/
diff --git a/package/Config.in b/package/Config.in
index 9907221b68..250dbe7f0e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -321,7 +321,6 @@ comment "QT libraries and helper libraries"
 	source "package/grantlee/Config.in"
 	source "package/qextserialport/Config.in"
 	source "package/qjson/Config.in"
-	source "package/qtuio/Config.in"
 	source "package/quazip/Config.in"
 	source "package/qwt/Config.in"
 endif
diff --git a/package/qtuio/0001-TuioServer.cpp-add-missing-include.patch b/package/qtuio/0001-TuioServer.cpp-add-missing-include.patch
deleted file mode 100644
index 99337026df..0000000000
--- a/package/qtuio/0001-TuioServer.cpp-add-missing-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4dd7cad8c95484a882eaa2aeaa74595a3dd93a07 Mon Sep 17 00:00:00 2001
-From: Stephan Hoffmann <sho@relinux.de>
-Date: Sun, 2 Dec 2012 13:36:41 +0100
-Subject: [PATCH] TuioServer.cpp: add missing include
-
-If usleep() is used the header <unistd.h> has to be included
-
-Signed-off-by: Stephan Hoffmann <sho@relinux.de>
----
- src/3rdparty/tuio/TuioServer.cpp |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/3rdparty/tuio/TuioServer.cpp b/src/3rdparty/tuio/TuioServer.cpp
-index f17bef9..851144c 100644
---- a/src/3rdparty/tuio/TuioServer.cpp
-+++ b/src/3rdparty/tuio/TuioServer.cpp
-@@ -25,6 +25,8 @@ using namespace TUIO;
- using namespace osc;
- 
- #ifndef WIN32
-+#include <unistd.h>
-+
- static void* ThreadFunc( void* obj )
- #else
- static DWORD WINAPI ThreadFunc( LPVOID obj )
--- 
-1.7.0.4
-
diff --git a/package/qtuio/0002-dont-append-_d-for-debug.patch b/package/qtuio/0002-dont-append-_d-for-debug.patch
deleted file mode 100644
index fbaaf19222..0000000000
--- a/package/qtuio/0002-dont-append-_d-for-debug.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-[PATCH] don't append _d to library name when Qt is built with debug support
-
-qtuio appends _d to the library name when Qt was built with debug support,
-breaking linking step for examples and staging/target install.
-
-There's no real advantage to the _d suffix, so simply fix it by removing
-the logic appending _d.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/qTUIO.pro |    5 -----
- 1 file changed, 5 deletions(-)
-
-Index: qtuio-abe4973ff6/src/qTUIO.pro
-===================================================================
---- qtuio-abe4973ff6.orig/src/qTUIO.pro
-+++ qtuio-abe4973ff6/src/qTUIO.pro
-@@ -16,11 +16,6 @@
- win32:LIBS += ws2_32.lib \
-     winmm.lib
- 
--# Changes the name of the target, when is debug mode
--CONFIG( debug, debug|release ) { 
--    TARGET = $${TARGET}_d
--    BUILD_NAME = debug
--}
- CONFIG( release, debug|release ):BUILD_NAME = release
- 
- # Temporary folders for the auxiliar files
diff --git a/package/qtuio/Config.in b/package/qtuio/Config.in
deleted file mode 100644
index f46f1dd407..0000000000
--- a/package/qtuio/Config.in
+++ /dev/null
@@ -1,22 +0,0 @@
-config BR2_PACKAGE_QTUIO
-	bool "qtuio"
-	depends on BR2_PACKAGE_QT
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  Implementation of an interface connecting TUIO messages
-	  and QT events
-
-	  https://github.com/x29a/qTUIO
-
-if BR2_PACKAGE_QTUIO
-
-config BR2_QTUIO_EXAMPLES
-	bool "qtuio examples"
-	help
-	  Build and install qtuio examples
-
-endif
-
-comment "qtuio depends on QT gui module"
-	depends on BR2_PACKAGE_QT
-	depends on !BR2_PACKAGE_QT_GUI_MODULE
diff --git a/package/qtuio/qtuio.hash b/package/qtuio/qtuio.hash
deleted file mode 100644
index bb9bdb1848..0000000000
--- a/package/qtuio/qtuio.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# locally computed
-sha256  65308adb59e910d552d4885772c7f99c7d19dec5e924d852a5a39a1972f8d223  qtuio-abe4973ff60654aad9df7037c4ca15c45f811d24.tar.gz
diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
deleted file mode 100644
index 6b90a2c06f..0000000000
--- a/package/qtuio/qtuio.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-################################################################################
-#
-# qtuio
-#
-################################################################################
-
-QTUIO_VERSION = abe4973ff60654aad9df7037c4ca15c45f811d24
-QTUIO_SITE = $(call github,x29a,qTUIO,$(QTUIO_VERSION))
-QTUIO_INSTALL_STAGING = YES
-QTUIO_DEPENDENCIES = qt
-
-QTUIO_LICENSE = GPL-3.0+
-QTUIO_LICENSE_FILES = COPYING
-
-# The pong example needs QtOpenGL support, which might become available
-# some time in the future. Then add pong to the list of examples.
-QTUIO_EXAMPLES = dials fingerpaint knobs pinchzoom
-
-ifeq ($(BR2_QTUIO_EXAMPLES),y)
-define QTUIO_CONFIGURE_EXAMPLES
-	for example in $(QTUIO_EXAMPLES) ; do \
-		(cd $(@D)/examples/$${example} && $(TARGET_MAKE_ENV) $(QT_QMAKE)) || exit 1; \
-	done
-endef
-endif
-
-define QTUIO_CONFIGURE_CMDS
-	cd $(@D)/src && $(TARGET_MAKE_ENV) $(QT_QMAKE)
-	$(QTUIO_CONFIGURE_EXAMPLES)
-endef
-
-ifeq ($(BR2_QTUIO_EXAMPLES),y)
-define QTUIO_BUILD_EXAMPLES
-	for example in $(QTUIO_EXAMPLES) ; do \
-		$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/examples/$${example} || exit 1; \
-	done
-endef
-endif
-
-define QTUIO_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src
-	$(QTUIO_BUILD_EXAMPLES)
-endef
-
-# Unfortunately, there is no working "install" target available
-ifeq ($(BR2_QTUIO_EXAMPLES),y)
-define QTUIO_INSTALL_EXAMPLES
-	for example in $(QTUIO_EXAMPLES) ; do \
-		$(INSTALL) -D -m 0755 $(@D)/examples/$${example}/$${example} $(TARGET_DIR)/usr/share/qtuio/$${example} || exit 1 ; \
-	done
-endef
-endif
-
-ifeq ($(BR2_PACKAGE_QT_STATIC),y)
-QTUIO_LIBRARY = libqTUIO.a
-else
-QTUIO_LIBRARY = libqTUIO.so*
-define QTUIO_INSTALL_TARGET_LIBRARY
-	cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(TARGET_DIR)/usr/lib
-endef
-endif
-
-define QTUIO_INSTALL_TARGET_CMDS
-	$(QTUIO_INSTALL_TARGET_LIBRARY)
-	$(QTUIO_INSTALL_EXAMPLES)
-endef
-
-define QTUIO_INSTALL_STAGING_CMDS
-	cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(STAGING_DIR)/usr/lib
-endef
-
-$(eval $(generic-package))
-- 
2.11.0

[Buildroot] [PATCH 11/16] package/libmediaart: remove qt4 support

[Peter Korsgaard]

Qt4 support is about to be dropped, so remove the support from libmediaart
as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libmediaart/Config.in      | 9 ++++-----
 package/libmediaart/libmediaart.mk | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/package/libmediaart/Config.in b/package/libmediaart/Config.in
index e073677395..c11d6f49d9 100644
--- a/package/libmediaart/Config.in
+++ b/package/libmediaart/Config.in
@@ -32,12 +32,11 @@ config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF
 
 config BR2_PACKAGE_LIBMEDIAART_BACKEND_QT
 	bool "Qt"
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE_GUI
 
-comment "Qt backend depends on Qt or Qt5"
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
+comment "Qt backend depends on Qt5"
+	depends on !BR2_PACKAGE_QT5
 
 endchoice
 
diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk
index f64210c266..a81542ac69 100644
--- a/package/libmediaart/libmediaart.mk
+++ b/package/libmediaart/libmediaart.mk
@@ -25,9 +25,7 @@ else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 endif
-LIBMEDIAART_DEPENDENCIES += \
-	$(if $(BR2_PACKAGE_QT),qt) \
-	$(if $(BR2_PACKAGE_QT5),qt5base)
+LIBMEDIAART_DEPENDENCIES += qt5base
 LIBMEDIAART_CONF_OPTS += \
 	--disable-gdkpixbuf \
 	--enable-qt
-- 
2.11.0

[Buildroot] [PATCH 12/16] package/qextserialport: remove qt4 support

[Peter Korsgaard]

Qt4 support is about to be dropped, so remove the support from
qextserialport as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qextserialport/Config.in         |  2 +-
 package/qextserialport/qextserialport.mk | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/package/qextserialport/Config.in b/package/qextserialport/Config.in
index 4e7ef13784..f880d335e5 100644
--- a/package/qextserialport/Config.in
+++ b/package/qextserialport/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_QEXTSERIALPORT
 	bool "qextserialport"
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
 	help
 	  A Qt library to manage serial ports
 
diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
index e3e325ce6c..ecaff21efc 100644
--- a/package/qextserialport/qextserialport.mk
+++ b/package/qextserialport/qextserialport.mk
@@ -14,16 +14,10 @@ ifeq ($(BR2_STATIC_LIBS),y)
 QEXTSERIALPORT_CONF_OPTS += CONFIG+=qesp_static
 endif
 
-ifeq ($(BR2_PACKAGE_QT),y)
-QEXTSERIALPORT_DEPENDENCIES += qt
-QEXTSERIALPORT_QMAKE = $(QT_QMAKE)
-else ifeq ($(BR2_PACKAGE_QT5),y)
-QEXTSERIALPORT_DEPENDENCIES += qt5base
-QEXTSERIALPORT_QMAKE = $(QT5_QMAKE)
-endif
+QEXTSERIALPORT_DEPENDENCIES = qt5base
 
 define QEXTSERIALPORT_CONFIGURE_CMDS
-	cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE) $(QEXTSERIALPORT_CONF_OPTS)
+	cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) $(QEXTSERIALPORT_CONF_OPTS)
 endef
 
 define QEXTSERIALPORT_BUILD_CMDS
-- 
2.11.0

[Buildroot] [PATCH 13/16] package/gjson: remove qt4 support

[Peter Korsgaard]

Qt4 support is about to be dropped, so remove the support from qjson as
well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qjson/Config.in | 4 ++--
 package/qjson/qjson.mk  | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package/qjson/Config.in b/package/qjson/Config.in
index 5c423bf317..243a6c1229 100644
--- a/package/qjson/Config.in
+++ b/package/qjson/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_QJSON
 	bool "qjson"
 	depends on !BR2_STATIC_LIBS
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
 	help
 	  QJson is a Qt-based library that maps JSON data to
 	  QVariant objects and vice versa.
@@ -10,4 +10,4 @@ config BR2_PACKAGE_QJSON
 
 comment "qjson needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
-	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk
index 1777b9454c..718d6622a8 100644
--- a/package/qjson/qjson.mk
+++ b/package/qjson/qjson.mk
@@ -7,9 +7,7 @@
 QJSON_VERSION = 0.9.0
 QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION))
 QJSON_INSTALL_STAGING = YES
-QJSON_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_QT),qt) \
-	$(if $(BR2_PACKAGE_QT5),qt5base)
+QJSON_DEPENDENCIES = qt5base
 QJSON_LICENSE = LGPL-2.1
 QJSON_LICENSE_FILES = COPYING.lib
 
-- 
2.11.0

[Buildroot] [PATCH 14/16] package/quazip: remove qt4 support

[Peter Korsgaard]

Qt4 support is about to be dropped, so remove the support from quazip as
well.

Also add an explicit depends on for qt5 for consistency with other packages.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/quazip/Config.in |  1 +
 package/quazip/quazip.mk | 11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/package/quazip/Config.in b/package/quazip/Config.in
index 83537d4613..e980297558 100644
--- a/package/quazip/Config.in
+++ b/package/quazip/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_QUAZIP
 	bool "quazip"
+	depends on BR2_PACKAGE_QT5
 	select BR2_PACKAGE_ZLIB
 	help
 	  QuaZIP is a simple C++ wrapper over Gilles Vollant's
diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk
index 872340ab40..aba8274506 100644
--- a/package/quazip/quazip.mk
+++ b/package/quazip/quazip.mk
@@ -9,19 +9,12 @@ QUAZIP_SITE = $(call github,stachenov,quazip,$(QUAZIP_VERSION))
 QUAZIP_INSTALL_STAGING = YES
 QUAZIP_DEPENDENCIES = \
 	zlib \
-	$(if $(BR2_PACKAGE_QT),qt) \
-	$(if $(BR2_PACKAGE_QT5),qt5base)
+	qt5base
 QUAZIP_LICENSE = LGPL-2.1
 QUAZIP_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PACKAGE_QT5),y)
-QUAZIP_QMAKE = $(QT5_QMAKE)
-else
-QUAZIP_QMAKE = $(QT_QMAKE)
-endif
-
 define QUAZIP_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(QUAZIP_QMAKE) PREFIX=/usr)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr)
 endef
 
 define QUAZIP_BUILD_CMDS
-- 
2.11.0

[Buildroot] [PATCH 15/16] package/qwt: remove qt4 support

[Peter Korsgaard]

Qt4 support is about to be dropped, so remove the support from qwt as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qwt/Config.in | 20 ++++++++------------
 package/qwt/qwt.mk    | 10 ++--------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 041c2d102c..f4132c8638 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,10 +1,9 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
-	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport
-	select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport
+	select BR2_PACKAGE_QT5BASE_CONCURRENT
 	help
 	  Qwt is a graphics extension to the Qt GUI application
 	  framework. It provides a 2D plotting widget and more.
@@ -15,18 +14,15 @@ if BR2_PACKAGE_QWT
 
 config BR2_PACKAGE_QWT_SVG
 	bool "SVG support"
-	select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5SVG
 
 config BR2_PACKAGE_QWT_MATHML
 	bool "MathML support"
 
 config BR2_PACKAGE_QWT_OPENGL
 	bool "OpenGL support"
-	depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_QT) || \
-		(BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_PACKAGE_QT5)
-	select BR2_PACKAGE_QT_OPENGL if BR2_PACKAGE_QT
-	select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
+	select BR2_PACKAGE_QT5BASE_OPENGL
+	select BR2_PACKAGE_QT5BASE_OPENGL_LIB
 
 endif
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index 619453bfc9..f381ebbb7a 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -8,13 +8,7 @@ QWT_VERSION = 6.1.3
 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2
 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION)
 QWT_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT),y)
-QWT_DEPENDENCIES = qt
-QWT_QMAKE = $(QT_QMAKE)
-else ifeq ($(BR2_PACKAGE_QT5),y)
-QWT_DEPENDENCIES += qt5base
-QWT_QMAKE = $(QT5_QMAKE)
-endif
+QWT_DEPENDENCIES = qt5base
 
 QWT_LICENSE = LGPL-2.1 with exceptions
 QWT_LICENSE_FILES = COPYING
@@ -49,7 +43,7 @@ endif
 
 define QWT_CONFIGURE_CMDS
 	$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
-	(cd $(@D); $(TARGET_MAKE_ENV) $(QWT_QMAKE))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE))
 endef
 
 define QWT_BUILD_CMDS
-- 
2.11.0

[Buildroot] [PATCH 16/16] package/qt: remove package

[Peter Korsgaard]

Qt4 has been marked obsolete for close to 1 year, since commit 3538b5fb10
(qt: mark as obsolete) and is no longer supported upstream since December
2015:

https://blog.qt.io/blog/2015/05/26/qt-4-8-7-released/

So now finally remove it as the in tree users have been removed.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 Config.in.legacy                                   |   6 +
 package/Config.in                                  |   3 +-
 ...e-check-to-treat-alsalib-1.1.x-as-correct.patch |  29 -
 package/qt/0002-configure.patch                    |  52 --
 package/qt/0003-eglwsegl-use-system.patch          | 802 ---------------------
 package/qt/0004-fix-const-atomics.patch            |  50 --
 package/qt/0005-pthread_getattr_np.patch           | 107 ---
 package/qt/0006-script-qtdbus-no-gui.patch         |  22 -
 ...7-Add-initial-support-of-ARC-architecture.patch | 183 -----
 .../qt/0008-Prevent-unaligned-access-on-ARC.patch  |  92 ---
 ...ion-constructor-error-for-legacy-c-compil.patch | 163 -----
 ...tform-socklen_t-on-other-C-libraries-than.patch |  43 --
 ...with-ldl-option-only-when-it-is-supported.patch | 116 ---
 ...012-OpenGL-EGL-Avoid-X11-header-collision.patch |  60 --
 ...-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch |  37 -
 .../qt/0014-Enable-QtWebKit-with-newer-GCC.patch   |  50 --
 ...-configure-fix-build-on-non-x86-platforms.patch | 146 ----
 package/qt/Config.gfx.in                           |  31 -
 package/qt/Config.in                               | 543 --------------
 package/qt/Config.keyboard.in                      |  12 -
 package/qt/Config.mouse.in                         |  26 -
 package/qt/Config.sql.in                           |  64 --
 package/qt/powervr.ini                             |   2 -
 package/qt/qt.hash                                 |   3 -
 package/qt/qt.mk                                   | 725 -------------------
 package/qt5/Config.in                              |   2 -
 26 files changed, 7 insertions(+), 3362 deletions(-)
 delete mode 100644 package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch
 delete mode 100644 package/qt/0002-configure.patch
 delete mode 100644 package/qt/0003-eglwsegl-use-system.patch
 delete mode 100644 package/qt/0004-fix-const-atomics.patch
 delete mode 100644 package/qt/0005-pthread_getattr_np.patch
 delete mode 100644 package/qt/0006-script-qtdbus-no-gui.patch
 delete mode 100644 package/qt/0007-Add-initial-support-of-ARC-architecture.patch
 delete mode 100644 package/qt/0008-Prevent-unaligned-access-on-ARC.patch
 delete mode 100644 package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch
 delete mode 100644 package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
 delete mode 100644 package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch
 delete mode 100644 package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch
 delete mode 100644 package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch
 delete mode 100644 package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch
 delete mode 100644 package/qt/0015-configure-fix-build-on-non-x86-platforms.patch
 delete mode 100644 package/qt/Config.gfx.in
 delete mode 100644 package/qt/Config.in
 delete mode 100644 package/qt/Config.keyboard.in
 delete mode 100644 package/qt/Config.mouse.in
 delete mode 100644 package/qt/Config.sql.in
 delete mode 100644 package/qt/powervr.ini
 delete mode 100644 package/qt/qt.hash
 delete mode 100644 package/qt/qt.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index 9c38abdc41..25b48fba82 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+config BR2_PACKAGE_QT
+	bool "qt package removed"
+	select BR2_LEGACY
+	help
+	  The qt package was removed.
+
 config BR2_PACKAGE_QTUIO
 	bool "qtuio package removed"
 	select BR2_LEGACY
diff --git a/package/Config.in b/package/Config.in
index 250dbe7f0e..9d023b94fe 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -312,10 +312,9 @@ comment "Graphic libraries"
 	source "package/tk/Config.in"
 
 comment "Other GUIs"
-	source "package/qt/Config.in"
 	source "package/qt5/Config.in"
 	source "package/kf5/Config.in"
-if BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+if BR2_PACKAGE_QT5
 comment "QT libraries and helper libraries"
 	source "package/cutelyst/Config.in"
 	source "package/grantlee/Config.in"
diff --git a/package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch b/package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch
deleted file mode 100644
index 4cec4bde52..0000000000
--- a/package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b8f98d956501dfa4ce03a137f15d404930a56066 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57@gmail.com>
-Date: Sat, 5 Mar 2016 10:25:33 +0300
-Subject: [PATCH] alsatest: Fix the check to treat alsalib 1.1.x as correct
- version
-
-Task-number: QTBUG-51681
-Change-Id: I63266c33342f02f4d1a5ea5786f5fbc5a1b421b3
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-[Upstream commit: https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f15d404930a56066]
-[Patch fixing ALSA detection. Taken from Qt5, but applies fine to Qt4.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- config.tests/unix/alsa/alsatest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp
-index cab6533977..0b45819b61 100644
---- a/config.tests/unix/alsa/alsatest.cpp
-+++ b/config.tests/unix/alsa/alsatest.cpp
-@@ -32,7 +32,7 @@
- ****************************************************************************/
- 
- #include <alsa/asoundlib.h>
--#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if SND_LIB_VERSION < 0x1000a  // 1.0.10
- #error "Alsa version found too old, require >= 1.0.10"
- #endif
- 
diff --git a/package/qt/0002-configure.patch b/package/qt/0002-configure.patch
deleted file mode 100644
index 07c9630c90..0000000000
--- a/package/qt/0002-configure.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix -hostprefix behaviour
-
-When -hostprefix ./configure option is used, Qt installs all its
-headers, libraries and binaries inside the given host prefix, instead
-of the prefix. This is used by Buildroot to make sure that all Qt
-libraries and headers are installed in $(STAGING_DIR).
-
-Qt ./configure script also allows to tune the installation location of
-various elements, for examples the plugins through the -plugindir
-option. Unfortunately, this option only impact the installation path
-on the target, but not on the host when -hostprefix is used.
-
-This patch modifies Qt ./configure script so that HOST_*PATH_STR
-variables are composed of the host prefix concatenated with the path
-of installation on the target. This way, the plugin installation local
-in the $(STAGING_DIR) and on the target remains the same.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- configure |   18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-Index: qt-everywhere-opensource-src-4.8.1/configure
-===================================================================
---- qt-everywhere-opensource-src-4.8.1.orig/configure
-+++ qt-everywhere-opensource-src-4.8.1/configure
-@@ -4661,15 +4661,15 @@
- 
- 
- if [ ! -z "$QT_HOST_PREFIX" ]; then
--    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"`
--    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
--    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
--    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"`
--    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"`
--    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
--    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
--    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"`
--    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"`
-+    HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX/$QT_INSTALL_PREFIX"`
-+    HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/$QT_INSTALL_DOCS"`
-+    HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/$QT_INSTALL_HEADERS"`
-+    HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/$QT_INSTALL_LIBS"`
-+    HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/$QT_INSTALL_BINS"`
-+    HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/$QT_INSTALL_PLUGINS"`
-+    HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/$QT_INSTALL_IMPORTS"`
-+    HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX/$QT_INSTALL_DATA"`
-+    HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/$QT_INSTALL_TRANSLATIONS"`
-     HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
-     HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
-     HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
diff --git a/package/qt/0003-eglwsegl-use-system.patch b/package/qt/0003-eglwsegl-use-system.patch
deleted file mode 100644
index cb3038138f..0000000000
--- a/package/qt/0003-eglwsegl-use-system.patch
+++ /dev/null
@@ -1,802 +0,0 @@
-Patch to remove obsolete powervr headers and instead use the headers provided
-on the system.
-
-Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
----
-Index: qt-4.8.5/src/3rdparty/powervr/pvr2d.h
-===================================================================
---- qt-4.8.5.orig/src/3rdparty/powervr/pvr2d.h	2013-07-08 11:24:33.010516867 -0500
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,502 +0,0 @@
--/*!****************************************************************************
-- at File          pvr2d.h
-- at Title         PVR2D external header file
-- at Author        Imagination Technologies
-- at Copyright     Copyright (c) by Imagination Technologies Limited.
--				This specification is protected by copyright laws and contains
--				material proprietary to Imagination Technologies Limited.
--				You may use and distribute this specification free of charge for implementing
--				the functionality therein, without altering or removing any trademark, copyright,
--				or other notice from the specification.
-- at Platform      Generic
-- at Description   PVR2D definitions for PVR2D clients
--******************************************************************************/
--
--
--/******************************************************************************
--Modifications :-
--$Log: pvr2d.h $
--******************************************************************************/
--
--#ifndef _PVR2D_H_
--#define _PVR2D_H_
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--/* PVR2D Platform-specific definitions */
--#define PVR2D_EXPORT
--#define PVR2D_IMPORT
--
--
--#define PVR2D_REV_MAJOR		2
--#define PVR2D_REV_MINOR		1
--
--typedef enum
--{
--	PVR2D_FALSE = 0,
--	PVR2D_TRUE
--} PVR2D_BOOL;
--
--
--/* error codes */
--typedef enum
--{
--	PVR2D_OK = 0,
--	PVR2DERROR_INVALID_PARAMETER = -1,
--	PVR2DERROR_DEVICE_UNAVAILABLE = -2,
--	PVR2DERROR_INVALID_CONTEXT = -3,
--	PVR2DERROR_MEMORY_UNAVAILABLE = -4,
--	PVR2DERROR_DEVICE_NOT_PRESENT = -5,
--	PVR2DERROR_IOCTL_ERROR = -6,
--	PVR2DERROR_GENERIC_ERROR = -7,
--	PVR2DERROR_BLT_NOTCOMPLETE = -8,
--	PVR2DERROR_HW_FEATURE_NOT_SUPPORTED = -9,
--	PVR2DERROR_NOT_YET_IMPLEMENTED = -10,
--	PVR2DERROR_MAPPING_FAILED = -11
--}PVR2DERROR;
--
--
--/* pixel formats */
--typedef enum
--{
--	PVR2D_1BPP = 0,
--	PVR2D_RGB565,
--	PVR2D_ARGB4444,
--	PVR2D_RGB888,
--	PVR2D_ARGB8888,
--	PVR2D_ARGB1555,
--	PVR2D_ALPHA8,
--	PVR2D_ALPHA4,
--	PVR2D_PAL2,
--	PVR2D_PAL4,
--	PVR2D_PAL8,
--	PVR2D_VGAEMU
--
--}PVR2DFORMAT;
--
--
--/* wrap surface type */
--typedef enum
--{
--	PVR2D_WRAPFLAG_NONCONTIGUOUS = 0,
--	PVR2D_WRAPFLAG_CONTIGUOUS = 1,
--
--}PVR2DWRAPFLAGS;
--
--/* flags for control information of additional blits */
--typedef enum
--{
--	PVR2D_BLIT_DISABLE_ALL					= 0x0000,	/* disable all additional controls */
--	PVR2D_BLIT_CK_ENABLE					= 0x0001,	/* enable colour key */
--	PVR2D_BLIT_GLOBAL_ALPHA_ENABLE			= 0x0002,	/* enable standard global alpha */
--	PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE	= 0x0004,	/* enable per-pixel alpha bleding */
--	PVR2D_BLIT_PAT_SURFACE_ENABLE			= 0x0008,	/* enable pattern surf (disable fill) */
--	PVR2D_BLIT_FULLY_SPECIFIED_ALPHA_ENABLE	= 0x0010,	/* enable fully specified alpha */
--	PVR2D_BLIT_ROT_90						= 0x0020,	/* apply 90 degree rotation to the blt */
--	PVR2D_BLIT_ROT_180						= 0x0040,	/* apply 180 degree rotation to the blt */
--	PVR2D_BLIT_ROT_270						= 0x0080,	/* apply 270 degree rotation to the blt */
--	PVR2D_BLIT_COPYORDER_TL2BR				= 0x0100,	/* copy order overrides */
--	PVR2D_BLIT_COPYORDER_BR2TL				= 0x0200,
--	PVR2D_BLIT_COPYORDER_TR2BL				= 0x0400,
--	PVR2D_BLIT_COPYORDER_BL2TR				= 0x0800,
--	PVR2D_BLIT_COLKEY_SOURCE				= 0x1000,	/* Key colour is on the source surface */
--	PVR2D_BLIT_COLKEY_DEST					= 0x2000	/* Key colour is on the destination surface */
--
--} PVR2DBLITFLAGS;
--
--/* standard alpha-blending functions, AlphaBlendingFunc field of PVR2DBLTINFO */
--typedef enum
--{
--	PVR2D_ALPHA_OP_SRC_DSTINV = 1,	/* source alpha : Cdst = Csrc*Asrc + Cdst*(1-Asrc) */
--	PVR2D_ALPHA_OP_SRCP_DSTINV = 2	/* premultiplied source alpha : Cdst = Csrc + Cdst*(1-Asrc) */
--} PVR2D_ALPHABLENDFUNC;
--
--/* blend ops for fully specified alpha */
--typedef enum
--{
--	PVR2D_BLEND_OP_ZERO = 0,
--	PVR2D_BLEND_OP_ONE = 1,
--	PVR2D_BLEND_OP_SRC = 2,
--	PVR2D_BLEND_OP_DST = 3,
--	PVR2D_BLEND_OP_GLOBAL = 4,
--	PVR2D_BLEND_OP_SRC_PLUS_GLOBAL = 5,
--	PVR2D_BLEND_OP_DST_PLUS_GLOBAL = 6
--}PVR2D_BLEND_OP;
--
--
--typedef void* PVR2D_HANDLE;
--
--
--/* Fully specified alpha blend :	pAlpha field of PVR2DBLTINFO structure					*/
--/* a fully specified Alpha Blend operation is defined as									*/
--/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (ALPHA_3 * DST (ALPHA))							*/
--/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (ALPHA_4 * DST (RGB))								*/
--/* if the pre-multiplication stage is enabled then the equations become the following:		*/
--/* PRE_MUL     = ((SRC(A)) * (Global Alpha Value))											*/
--/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (PRE_MUL * DST (ALPHA))							*/
--/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (PRE_MUL * DST (RGB))								*/
--/* if the transparent source alpha stage is enabled then a source alpha of zero forces the	*/
--/* source to be transparent for that pixel regardless of the blend equation being used.		*/
--typedef struct _PVR2D_ALPHABLT
--{
--	PVR2D_BLEND_OP	eAlpha1;
--	PVR2D_BOOL		bAlpha1Invert;
--	PVR2D_BLEND_OP	eAlpha2;
--	PVR2D_BOOL		bAlpha2Invert;
--	PVR2D_BLEND_OP	eAlpha3;
--	PVR2D_BOOL		bAlpha3Invert;
--	PVR2D_BLEND_OP	eAlpha4;
--	PVR2D_BOOL		bAlpha4Invert;
--	PVR2D_BOOL		bPremulAlpha;			/* enable pre-multiplication stage */
--	PVR2D_BOOL		bTransAlpha;			/* enable transparent source alpha stage */
--	PVR2D_BOOL		bUpdateAlphaLookup;		/* enable and update the 1555-Lookup alpha table */
--	unsigned char	uAlphaLookup0;			/* 8 bit alpha when A=0 in a 1555-Lookup surface */
--	unsigned char	uAlphaLookup1;			/* 8 bit alpha when A=1 in a 1555-Lookup surface */
--	unsigned char	uGlobalRGB;				/* Global Alpha Value for RGB, 0=transparent 255=opaque */
--	unsigned char	uGlobalA;				/* Global Alpha Value for Alpha */
--
--} PVR2D_ALPHABLT, *PPVR2D_ALPHABLT;
--
--
--/* surface memory info structure */
--typedef struct _PVR2DMEMINFO
--{
--	void				*pBase;
--	unsigned long		ui32MemSize;
--	unsigned long		ui32DevAddr;
--	unsigned long		ulFlags;
--	void				*hPrivateData;
--	void				*hPrivateMapData;
--
--}PVR2DMEMINFO, *PPVR2DMEMINFO;
--
--
--#define PVR2D_MAX_DEVICE_NAME 20
--
--typedef struct _PVR2DDEVICEINFO
--{
--	unsigned long	ulDevID;
--	char			szDeviceName[PVR2D_MAX_DEVICE_NAME];
--}PVR2DDEVICEINFO;
--
--
--typedef struct _PVR2DISPLAYINFO
--{
--	unsigned long	ulMaxFlipChains;
--	unsigned long	ulMaxBuffersInChain;
--	PVR2DFORMAT		eFormat;
--	unsigned long	ulWidth;
--	unsigned long	ulHeight;
--	long			lStride;
--	unsigned long	ulMinFlipInterval;
--	unsigned long	ulMaxFlipInterval;
--
--}PVR2DDISPLAYINFO;
--
--
--typedef struct _PVR2DBLTINFO
--{
--	unsigned long	CopyCode;			/* rop code  */
--	unsigned long	Colour;				/* fill colour */
--	unsigned long	ColourKey;			/* colour key */
--	unsigned char	GlobalAlphaValue;	/* global alpha blending */
--	unsigned char	AlphaBlendingFunc;	/* per-pixel alpha-blending function */
--
--	PVR2DBLITFLAGS	BlitFlags;			/* additional blit control information */
--
--	PVR2DMEMINFO	*pDstMemInfo;		/* destination memory */
--	unsigned long	DstOffset;			/* byte offset from start of allocation to destination surface pixel 0,0 */
--	long			DstStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */
--	long			DstX, DstY;			/* pixel offset from start of dest surface to start of blt rectangle */
--	long			DSizeX,DSizeY;		/* blt size */
--	PVR2DFORMAT		DstFormat;			/* dest format */
--	unsigned long	DstSurfWidth;		/* size of dest surface in pixels */
--	unsigned long	DstSurfHeight;		/* size of dest surface in pixels */
--
--	PVR2DMEMINFO	*pSrcMemInfo;		/* source mem, (source fields are also used for patterns) */
--	unsigned long	SrcOffset;			/* byte offset from start of allocation to src/pat surface pixel 0,0 */
--	long			SrcStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */
--	long			SrcX, SrcY;			/* pixel offset from start of surface to start of source rectangle */
--										/* for patterns this is the start offset within the pattern */
--	long			SizeX,SizeY;		/* source rectangle size or pattern size in pixels */
--	PVR2DFORMAT		SrcFormat;			/* source/pattern format */
--	PVR2DMEMINFO	*pPalMemInfo;		/* source/pattern palette memory containing argb8888 colour table */
--	unsigned long	PalOffset;			/* byte offset from start of allocation to start of palette */
--	unsigned long	SrcSurfWidth;		/* size of source surface in pixels */
--	unsigned long	SrcSurfHeight;		/* size of source surface in pixels */
--
--	PVR2DMEMINFO	*pMaskMemInfo;		/* mask memory, 1bpp format implied */
--	unsigned long	MaskOffset;			/* byte offset from start of allocation to mask surface pixel 0,0 */
--	long			MaskStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */
--	long			MaskX, MaskY;		/* mask rect top left (mask size = blt size) */
--	unsigned long	MaskSurfWidth;		/* size of mask surface in pixels */
--	unsigned long	MaskSurfHeight;		/* size of mask surface in pixels */
--	
--	PPVR2D_ALPHABLT pAlpha;				/* fully specified alpha blend */
--
--}PVR2DBLTINFO, *PPVR2DBLTINFO;
--
--typedef struct _PVR2DRECT
--{
--	long left, top;
--	long right, bottom;
--} PVR2DRECT;
--
--typedef struct
--{
--	PVR2DMEMINFO	*pSurfMemInfo;		/* surface memory */
--	unsigned long	SurfOffset;			/* byte offset from start of allocation to destination surface pixel 0,0 */
--	long			Stride;				/* signed stride */
--	PVR2DFORMAT		Format;
--	unsigned long	SurfWidth;			/* surface size in pixels */
--	unsigned long	SurfHeight;
--
--} PVR2D_SURFACE, *PPVR2D_SURFACE;
--
--typedef struct
--{
--	unsigned long	*pUseCode;					/* USSE code */
--	unsigned long	UseCodeSize;				/* usse code size in bytes */
--
--} PVR2D_USECODE, *PPVR2D_USECODE;
--
--typedef struct
--{
--	PVR2D_SURFACE			sDst;				/* destination surface */
--	PVR2D_SURFACE			sSrc;				/* source surface */
--	PVR2DRECT				rcDest;				/* destination rectangle */
--	PVR2DRECT				rcSource;			/* source rectangle */
--	PVR2D_HANDLE			hUseCode;			/* custom USE code (NULL implies source copy) */
--	unsigned long			UseParams[2];		/* per-blt params for use code */
--
--} PVR2D_3DBLT, *PPVR2D_3DBLT;
--
--
--#define MAKE_COPY_BLIT(src,soff,dest,doff,sx,sy,dx,dy,sz)
--
--typedef void* PVR2DCONTEXTHANDLE;
--typedef void* PVR2DFLIPCHAINHANDLE;
--
--
--// CopyCode field of PVR2DBLTINFO structure:
--// the CopyCode field of the PVR2DBLTINFO structure should contain a rop3 or rop4 code.
--// a rop3 is an 8 bit code that describes a blt with three inputs : source dest and pattern
--// rop4 is a 16 bit code that describes a blt with four inputs : source dest pattern and mask
--// common rop3 codes are defined below
--// a colour fill blt is processed in the pattern channel as a constant colour with a rop code of 0xF0
--// PVR2D_BLIT_PAT_SURFACE_ENABLE defines whether the pattern channel is a surface or a fill colour.
--// a rop4 is defined by two rop3 codes, and the 1 bit-per-pixel mask surface defines which is used.
--// a common rop4 is 0xAAF0 which is the mask copy blt used for text glyphs.
--// CopyCode is taken to be a rop4 when pMaskMemInfo is non zero, otherwise it is assumed to be a rop3
--// use the PVR2DMASKROP4 macro below to construct a rop4 from two rop3's
--// rop3a is the rop used when mask pixel = 1, and rop3b when mask = 0
--#define PVR2DROP4(rop3b, rop3a)			((rop3b<<8)|rop3a)
--
--/* common rop codes */
--#define PVR2DROPclear				0x00       /* 0 (whiteness) */
--#define PVR2DROPset					0xFF       /* 1 (blackness) */
--#define PVR2DROPnoop				0xAA       /* dst (used for masked blts) */
--
--/* source and  dest rop codes */
--#define PVR2DROPand					0x88       /* src AND dst */
--#define PVR2DROPandReverse			0x44       /* src AND NOT dst */
--#define PVR2DROPcopy				0xCC       /* src (used for source copy and alpha blts) */
--#define PVR2DROPandInverted			0x22       /* NOT src AND dst */
--#define PVR2DROPxor					0x66       /* src XOR dst */
--#define PVR2DROPor					0xEE       /* src OR dst */
--#define PVR2DROPnor					0x11       /* NOT src AND NOT dst */
--#define PVR2DROPequiv				0x99       /* NOT src XOR dst */
--#define PVR2DROPinvert				0x55       /* NOT dst */
--#define PVR2DROPorReverse			0xDD       /* src OR NOT dst */
--#define PVR2DROPcopyInverted		0x33       /* NOT src */
--#define PVR2DROPorInverted			0xBB       /* NOT src OR dst */
--#define PVR2DROPnand				0x77       /* NOT src OR NOT dst */
--
--/* pattern rop codes */
--#define PVR2DPATROPand				0xA0       /* pat AND dst */
--#define PVR2DPATROPandReverse		0x50       /* pat AND NOT dst */
--#define PVR2DPATROPcopy				0xF0       /* pat (used for solid color fills and pattern blts) */
--#define PVR2DPATROPandInverted		0x0A       /* NOT pat AND dst */
--#define PVR2DPATROPxor				0x5A       /* pat XOR dst */
--#define PVR2DPATROPor				0xFA       /* pat OR dst */
--#define PVR2DPATROPnor				0x05       /* NOT pat AND NOT dst */
--#define PVR2DPATROPequiv			0xA5       /* NOT pat XOR dst */
--#define PVR2DPATROPinvert			0x55       /* NOT dst */
--#define PVR2DPATROPorReverse		0xF5       /* pat OR NOT dst */
--#define PVR2DPATROPcopyInverted		0x0F       /* NOT pat */
--#define PVR2DPATROPorInverted		0xAF       /* NOT pat OR dst */
--#define PVR2DPATROPnand				0x5F       /* NOT pat OR NOT dst */
--
--/* common rop4 codes */
--#define PVR2DROP4MaskedCopy              PVR2DROP4(PVR2DROPnoop,PVR2DROPcopy)		/* masked source copy blt (used for rounded window corners etc) */
--#define PVR2DROP4MaskedFill              PVR2DROP4(PVR2DROPnoop,PVR2DPATROPcopy)	/* masked colour fill blt (used for text) */
--
--/* Legacy support */
--#define PVR2DROP3_PATMASK			PVR2DPATROPcopy
--#define PVR2DROP3_SRCMASK			PVR2DROPcopy
--
--/* pixmap memory alignment */
--#define PVR2D_ALIGNMENT_4			4			/* DWORD alignment */
--#define PVR2D_ALIGNMENT_ANY			0			/* no alignment    */
--#define PVR2D_ALIGNMENT_PALETTE		16			/* 16 byte alignment is required for palettes */
--
--/* Heap number for PVR2DGetFrameBuffer */
--#define PVR2D_FB_PRIMARY_SURFACE 0
--
--#define PVR2D_PRESENT_PROPERTY_SRCSTRIDE	(1 << 0)
--#define PVR2D_PRESENT_PROPERTY_DSTSIZE		(1 << 1)
--#define PVR2D_PRESENT_PROPERTY_DSTPOS		(1 << 2)
--#define PVR2D_PRESENT_PROPERTY_CLIPRECTS	(1 << 3)
--#define PVR2D_PRESENT_PROPERTY_INTERVAL		(1 << 4)
--
--
--#define PVR2D_CREATE_FLIPCHAIN_SHARED		(1 << 0)
--#define PVR2D_CREATE_FLIPCHAIN_QUERY		(1 << 1)
--
--/* Functions that the library exports */
--
--PVR2D_IMPORT
--int PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DCreateDeviceContext(unsigned long ulDevID,
--									PVR2DCONTEXTHANDLE* phContext,
--									unsigned long ulFlags);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DDestroyDeviceContext(PVR2DCONTEXTHANDLE hContext);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetDeviceInfo(PVR2DCONTEXTHANDLE hContext,
--							  PVR2DDISPLAYINFO *pDisplayInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetScreenMode(PVR2DCONTEXTHANDLE hContext,
--							  PVR2DFORMAT *pFormat,
--							  long *plWidth,
--							  long *plHeight,
--							  long *plStride,
--							  int *piRefreshRate);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetFrameBuffer(PVR2DCONTEXTHANDLE hContext,
--							   int nHeap,
--							   PVR2DMEMINFO **ppsMemInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DMemAlloc(PVR2DCONTEXTHANDLE hContext,
--						 unsigned long ulBytes,
--						 unsigned long ulAlign,
--						 unsigned long ulFlags,
--						 PVR2DMEMINFO **ppsMemInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DMemWrap(PVR2DCONTEXTHANDLE hContext,
--						void *pMem,
--						unsigned long ulFlags,
--						unsigned long ulBytes,
--						unsigned long alPageAddress[],
--						PVR2DMEMINFO **ppsMemInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DMemMap(PVR2DCONTEXTHANDLE hContext,
--						unsigned long ulFlags,
--						void *hPrivateMapData,
--						PVR2DMEMINFO **ppsDstMem);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DMemFree(PVR2DCONTEXTHANDLE hContext,
--						PVR2DMEMINFO *psMemInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DBlt(PVR2DCONTEXTHANDLE hContext,
--					PVR2DBLTINFO *pBltInfo);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DBltClipped(PVR2DCONTEXTHANDLE hContext,
--						   PVR2DBLTINFO *pBltInfo,
--						   unsigned long ulNumClipRects,
--						   PVR2DRECT *pClipRects);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DQueryBlitsComplete(PVR2DCONTEXTHANDLE hContext,
--								   PVR2DMEMINFO *pMemInfo,
--								   unsigned int uiWaitForComplete);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DSetPresentBltProperties(PVR2DCONTEXTHANDLE hContext,
--										unsigned long ulPropertyMask,
--										long lSrcStride,
--										unsigned long ulDstWidth,
--										unsigned long ulDstHeight,
--										long lDstXPos,
--										long lDstYPos,
--										unsigned long ulNumClipRects,
--										PVR2DRECT *pClipRects,
--										unsigned long ulSwapInterval);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DPresentBlt(PVR2DCONTEXTHANDLE hContext,
--						   PVR2DMEMINFO *pMemInfo,
--						   long lRenderID);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DCreateFlipChain(PVR2DCONTEXTHANDLE hContext,
--								unsigned long ulFlags,
--								unsigned long ulNumBuffers,
--								unsigned long ulWidth,
--								unsigned long ulHeight,
--								PVR2DFORMAT eFormat,
--								long *plStride,
--								unsigned long *pulFlipChainID,
--								PVR2DFLIPCHAINHANDLE *phFlipChain);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DDestroyFlipChain(PVR2DCONTEXTHANDLE hContext,
--								 PVR2DFLIPCHAINHANDLE hFlipChain);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetFlipChainBuffers(PVR2DCONTEXTHANDLE hContext,
--									PVR2DFLIPCHAINHANDLE hFlipChain,
--									unsigned long *pulNumBuffers,
--									PVR2DMEMINFO *psMemInfo[]);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DSetPresentFlipProperties(PVR2DCONTEXTHANDLE hContext,
--										 PVR2DFLIPCHAINHANDLE hFlipChain,
--										 unsigned long ulPropertyMask,
--										 long lDstXPos,
--										 long lDstYPos,
--										 unsigned long ulNumClipRects,
--										 PVR2DRECT *pClipRects,
--										 unsigned long ulSwapInterval);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DPresentFlip(PVR2DCONTEXTHANDLE hContext,
--							PVR2DFLIPCHAINHANDLE hFlipChain,
--							PVR2DMEMINFO *psMemInfo,
--							long lRenderID);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DGetAPIRev(long *lRevMajor, long *lRevMinor);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DLoadUseCode (const PVR2DCONTEXTHANDLE hContext, const unsigned char	*pUseCode,
--									const unsigned long UseCodeSize, PVR2D_HANDLE *pUseCodeHandle);
--PVR2D_IMPORT
--PVR2DERROR PVR2DFreeUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_HANDLE hUseCodeHandle);
--
--PVR2D_IMPORT
--PVR2DERROR PVR2DBlt3D (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT pBlt3D);
--
--#ifdef __cplusplus
--}
--#endif 
--
--#endif /* _PVR2D_H_ */
--
--/******************************************************************************
-- End of file (pvr2d.h)
--******************************************************************************/
-Index: qt-4.8.5/src/3rdparty/powervr/wsegl.h
-===================================================================
---- qt-4.8.5.orig/src/3rdparty/powervr/wsegl.h	2013-07-08 11:24:33.010516867 -0500
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,240 +0,0 @@
--/******************************************************************************
-- Name         : wsegl.h
-- Copyright    :	Copyright (c) Imagination Technologies Limited.
--				This specification is protected by copyright laws and contains
--				material proprietary to Imagination Technologies Limited.
--				You may use and distribute this specification free of charge for implementing
--				the functionality therein, without altering or removing any trademark, copyright,
--				or other notice from the specification.
-- Platform     : ANSI
--*****************************************************************************/
--
--
--#if !defined(__WSEGL_H__)
--#define __WSEGL_H__
--
--#ifdef __cplusplus
--extern "C" {
--#endif 
--
--/*
--// WSEGL Platform-specific definitions
--*/
--#define WSEGL_EXPORT
--#define WSEGL_IMPORT
--
--/*
--// WSEGL API Version Number
--*/
--
--#define WSEGL_VERSION 1
--#define WSEGL_DEFAULT_DISPLAY 0
--#define WSEGL_DEFAULT_NATIVE_ENGINE 0
--
--#define WSEGL_FALSE		0
--#define WSEGL_TRUE		1
--#define WSEGL_NULL		0
--
--#define	WSEGL_UNREFERENCED_PARAMETER(param) (param) = (param)
--
--/*
--// WSEGL handles
--*/
--typedef void *WSEGLDisplayHandle;
--typedef void *WSEGLDrawableHandle;
--
--/*
--// Display capability type
--*/
--typedef enum WSEGLCapsType_TAG
--{
--	WSEGL_NO_CAPS = 0,
--	WSEGL_CAP_MIN_SWAP_INTERVAL = 1, /* System default value = 1 */
--	WSEGL_CAP_MAX_SWAP_INTERVAL = 2, /* System default value = 1 */
--	WSEGL_CAP_WINDOWS_USE_HW_SYNC = 3, /* System default value = 0 (FALSE) */
--	WSEGL_CAP_PIXMAPS_USE_HW_SYNC = 4, /* System default value = 0 (FALSE) */
--
--} WSEGLCapsType;
--
--/*
--// Display capability
--*/
--typedef struct WSEGLCaps_TAG
--{
--	WSEGLCapsType eCapsType;
--	unsigned long ui32CapsValue;
--
--} WSEGLCaps;
--
--/*
--// Drawable type
--*/
--#define WSEGL_NO_DRAWABLE			0x0
--#define WSEGL_DRAWABLE_WINDOW		0x1
--#define WSEGL_DRAWABLE_PIXMAP		0x2
--
--
--/*
--// Pixel format of display/drawable
--*/
--typedef enum WSEGLPixelFormat_TAG
--{
--	WSEGL_PIXELFORMAT_565 = 0,
--	WSEGL_PIXELFORMAT_4444 = 1,
--	WSEGL_PIXELFORMAT_8888 = 2,
--	WSEGL_PIXELFORMAT_1555 = 3
--
--} WSEGLPixelFormat;
--
--/*
--// Transparent of display/drawable
--*/
--typedef enum WSEGLTransparentType_TAG
--{
--	WSEGL_OPAQUE = 0,
--	WSEGL_COLOR_KEY = 1,
--
--} WSEGLTransparentType;
--
--/*
--// Display/drawable configuration
--*/
--typedef struct WSEGLConfig_TAG
--{
--	/*
--	// Type of drawables this configuration applies to -
--	// OR'd values of drawable types. 
--	*/
--	unsigned long ui32DrawableType;
--
--	/* Pixel format */
--	WSEGLPixelFormat ePixelFormat;
--
--	/* Native Renderable  - set to WSEGL_TRUE if native renderable */
--	unsigned long ulNativeRenderable;
--
--	/* FrameBuffer Level Parameter */
--	unsigned long ulFrameBufferLevel;
--
--	/* Native Visual ID */
--	unsigned long ulNativeVisualID;
--
--	/* Native Visual */
--	void *hNativeVisual;
--
--	/* Transparent Type */
--	WSEGLTransparentType eTransparentType;
--
--	/* Transparent Color - only used if transparent type is COLOR_KEY */
--	unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */
--
--
--} WSEGLConfig;
--
--/*
--// WSEGL errors
--*/
--typedef enum WSEGLError_TAG
--{
--	WSEGL_SUCCESS = 0,
--	WSEGL_CANNOT_INITIALISE = 1,
--	WSEGL_BAD_NATIVE_DISPLAY = 2,
--	WSEGL_BAD_NATIVE_WINDOW = 3,
--	WSEGL_BAD_NATIVE_PIXMAP = 4,
--	WSEGL_BAD_NATIVE_ENGINE = 5,
--	WSEGL_BAD_DRAWABLE = 6,
--	WSEGL_BAD_CONFIG = 7,
--	WSEGL_OUT_OF_MEMORY = 8
--
--} WSEGLError; 
--
--/*
--// Drawable orientation (in degrees anti-clockwise)
--*/
--typedef enum WSEGLRotationAngle_TAG
--{
--	WSEGL_ROTATE_0 = 0,
--	WSEGL_ROTATE_90 = 1,
--	WSEGL_ROTATE_180 = 2,
--	WSEGL_ROTATE_270 = 3
--
--} WSEGLRotationAngle; 
--
--/*
--// Drawable information required by OpenGL-ES driver
--*/
--typedef struct WSEGLDrawableParams_TAG
--{
--	/* Width in pixels of the drawable */
--	unsigned long	ui32Width;
--
--	/* Height in pixels of the drawable */
--	unsigned long	ui32Height;
--
--	/* Stride in pixels of the drawable */
--	unsigned long	ui32Stride;
--
--	/* Pixel format of the drawable */
--	WSEGLPixelFormat	ePixelFormat;
--
--	/* User space cpu virtual address of the drawable */
--	void   			*pvLinearAddress;
--
--	/* HW address of the drawable */
--	unsigned long	ui32HWAddress;
--
--	/* Private data for the drawable */
--	void			*hPrivateData;
--
--} WSEGLDrawableParams;
--
--
--/*
--// Table of function pointers that is returned by WSEGL_GetFunctionTablePointer()
--//
--// The first entry in the table is the version number of the wsegl.h header file that
--// the module has been written against, and should therefore be set to WSEGL_VERSION
--*/
--typedef struct WSEGL_FunctionTable_TAG
--{
--	unsigned long ui32WSEGLVersion;
--
--	WSEGLError (*pfnWSEGL_IsDisplayValid)(NativeDisplayType);
--
--	WSEGLError (*pfnWSEGL_InitialiseDisplay)(NativeDisplayType, WSEGLDisplayHandle *, const WSEGLCaps **, WSEGLConfig **);
--
--	WSEGLError (*pfnWSEGL_CloseDisplay)(WSEGLDisplayHandle);
--
--	WSEGLError (*pfnWSEGL_CreateWindowDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativeWindowType, WSEGLRotationAngle *);
--
--	WSEGLError (*pfnWSEGL_CreatePixmapDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativePixmapType, WSEGLRotationAngle *);
--
--	WSEGLError (*pfnWSEGL_DeleteDrawable)(WSEGLDrawableHandle);
--
--	WSEGLError (*pfnWSEGL_SwapDrawable)(WSEGLDrawableHandle, unsigned long);
--
--	WSEGLError (*pfnWSEGL_SwapControlInterval)(WSEGLDrawableHandle, unsigned long);
--
--	WSEGLError (*pfnWSEGL_WaitNative)(WSEGLDrawableHandle, unsigned long);
--
--	WSEGLError (*pfnWSEGL_CopyFromDrawable)(WSEGLDrawableHandle, NativePixmapType);
--
--	WSEGLError (*pfnWSEGL_CopyFromPBuffer)(void *, unsigned long, unsigned long, unsigned long, WSEGLPixelFormat, NativePixmapType);
--
--	WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *);
--
--
--} WSEGL_FunctionTable;
--
--
--WSEGL_IMPORT const WSEGL_FunctionTable *WSEGL_GetFunctionTablePointer(void);
--
--#ifdef __cplusplus
--}
--#endif 
--
--#endif /* __WSEGL_H__ */
--
--/******************************************************************************
-- End of file (wsegl.h)
--******************************************************************************/
-Index: qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
-===================================================================
---- qt-4.8.5.orig/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c	2013-07-08 11:24:33.010516867 -0500
-+++ qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c	2013-07-08 11:28:26.142521123 -0500
-@@ -39,7 +39,7 @@
- **
- ****************************************************************************/
- 
--#include <GLES/eglplatform.h>
-+#include <EGL/eglplatform.h>
- #include <wsegl.h>
- #include <pvr2d.h>
- #include <string.h>
-@@ -379,6 +379,20 @@
-     return WSEGL_SUCCESS;
- }
- 
-+/* Function stub for ConnectDrawable() */
-+static WSEGLError wseglConnectDrawable(WSEGLDrawableHandle hDrawable)
-+{
-+    WSEGL_UNREFERENCED_PARAMETER(hDrawable);
-+    return WSEGL_SUCCESS;
-+}
-+
-+/* Function stub for DisconnectDrawable() */
-+static WSEGLError wseglDisconnectDrawable(WSEGLDrawableHandle hDrawable)
-+{
-+    WSEGL_UNREFERENCED_PARAMETER(hDrawable);
-+    return WSEGL_SUCCESS;
-+}
-+
- static WSEGL_FunctionTable const wseglFunctions = {
-     WSEGL_VERSION,
-     wseglIsDisplayValid,
-@@ -392,7 +406,9 @@
-     wseglWaitNative,
-     wseglCopyFromDrawable,
-     wseglCopyFromPBuffer,
--    wseglGetDrawableParameters
-+    wseglGetDrawableParameters,
-+    wseglConnectDrawable,
-+    wseglDisconnectDrawable
- };
- 
- /* Return the table of WSEGL functions to the EGL implementation */
diff --git a/package/qt/0004-fix-const-atomics.patch b/package/qt/0004-fix-const-atomics.patch
deleted file mode 100644
index 64853565e8..0000000000
--- a/package/qt/0004-fix-const-atomics.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d4d07dac01796b2aa0fb501c14865cab7e42b3a9 Mon Sep 17 00:00:00 2001
-From: Mischa Jonker <mischa.jonker@synopsys.com>
-Date: Sun, 4 Nov 2012 11:42:04 +0100
-Subject: [PATCH] Fix const-related build error in generic atomic ops
-
-It's still not entirely const-correct though. In all other architectures
-this is obfuscated through the use of inline asm (which the compiler
-doesn't check). This patch obfuscates through const_cast
----
- src/corelib/arch/generic/qatomic_generic_unix.cpp |    8 ++++----
- src/corelib/arch/qatomic_generic.h                |    2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/corelib/arch/generic/qatomic_generic_unix.cpp b/src/corelib/arch/generic/qatomic_generic_unix.cpp
-index 1c6cbf0..6fce81d 100644
---- a/src/corelib/arch/generic/qatomic_generic_unix.cpp
-+++ b/src/corelib/arch/generic/qatomic_generic_unix.cpp
-@@ -85,13 +85,13 @@ int QBasicAtomicInt_fetchAndAddOrdered(volatile int *_q_value, int valueToAdd)
- 
- Q_CORE_EXPORT
- bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *_q_value,
--                                           void *expectedValue,
--                                           void *newValue)
-+                                           const void *expectedValue,
-+                                           const void *newValue)
- {
-     bool returnValue = false;
-     pthread_mutex_lock(&qAtomicMutex);
-     if (*_q_value == expectedValue) {
--        *_q_value = newValue;
-+        *_q_value = const_cast<void*>(newValue);
-         returnValue = true;
-     }
-     pthread_mutex_unlock(&qAtomicMutex);
-diff --git a/src/corelib/arch/qatomic_generic.h b/src/corelib/arch/qatomic_generic.h
-index 621a767..4c14679 100644
---- a/src/corelib/arch/qatomic_generic.h
-+++ b/src/corelib/arch/qatomic_generic.h
-@@ -105,7 +105,7 @@ Q_CORE_EXPORT bool QBasicAtomicInt_testAndSetOrdered(volatile int *, int, int);
- Q_CORE_EXPORT int QBasicAtomicInt_fetchAndStoreOrdered(volatile int *, int);
- Q_CORE_EXPORT int QBasicAtomicInt_fetchAndAddOrdered(volatile int *, int);
- 
--Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, void *, void *);
-+Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, const void *, const void *);
- Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndStoreOrdered(void * volatile *, void *);
- Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *, qptrdiff);
- 
--- 
-1.7.0.4
-
diff --git a/package/qt/0005-pthread_getattr_np.patch b/package/qt/0005-pthread_getattr_np.patch
deleted file mode 100644
index 28f0c8411b..0000000000
--- a/package/qt/0005-pthread_getattr_np.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Add pthred_getattr_np / phread_attr_getstrack alternatives for uClibc
-
-Based on https://dev.openwrt.org/log/packages/Xorg/lib/qt4/patches/100-fix-webkit-for-uclibc.patch?rev=20371
-
-Signed-off-by: Johan Sagaert <sagaert.johan@skynet.be>
----
- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp |   61 ++++++++++
- 1 file changed, 61 insertions(+)
-
-Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
-===================================================================
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
-@@ -70,6 +70,23 @@
- #endif
- #include <unistd.h>
- 
-+#if defined(QT_LINUXBASE)
-+#include <dlfcn.h>
-+#endif
-+
-+#if defined(__UCLIBC__)
-+// versions of uClibc 0.9.32 and below with linuxthreads.old do not have
-+// pthread_getattr_np or pthread_attr_getstack.
-+#if __UCLIBC_MAJOR__ == 0 && \
-+    (__UCLIBC_MINOR__ < 9 || \
-+    (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \
-+    defined(__LINUXTHREADS_OLD__)
-+#define UCLIBC_USE_PROC_SELF_MAPS 1
-+#include <stdio_ext.h>
-+extern int *__libc_stack_end;
-+#endif
-+#endif
-+
- #if OS(SOLARIS)
- #include <thread.h>
- #else
-@@ -648,6 +665,37 @@
-     get_thread_info(find_thread(NULL), &threadInfo);
-     return threadInfo.stack_end;
- #elif OS(UNIX)
-+#ifdef UCLIBC_USE_PROC_SELF_MAPS
-+    // Read /proc/self/maps and locate the line whose address
-+    // range contains __libc_stack_end.
-+    FILE *file = fopen("/proc/self/maps", "r");
-+    if (!file)
-+        return 0;
-+    __fsetlocking(file, FSETLOCKING_BYCALLER);
-+    char *line = NULL;
-+    size_t lineLen = 0;
-+    while (!feof_unlocked(file)) {
-+        if (getdelim(&line, &lineLen, '\n', file) <= 0)
-+            break;
-+
-+        long from;
-+        long to;
-+        if (sscanf (line, "%lx-%lx", &from, &to) != 2)
-+            continue;
-+        if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) {
-+            fclose(file);
-+            free(line);
-+#ifdef _STACK_GROWS_UP
-+            return (void *)from;
-+#else
-+            return (void *)to;
-+#endif
-+        }
-+    }
-+    fclose(file);
-+    free(line);
-+    return 0;
-+#else
-     AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
-     MutexLocker locker(mutex);
-     static void* stackBase = 0;
-@@ -655,11 +703,23 @@
-     static pthread_t stackThread;
-     pthread_t thread = pthread_self();
-     if (stackBase == 0 || thread != stackThread) {
-+
-+#if defined(QT_LINUXBASE)
-+        // LinuxBase is missing pthread_getattr_np - resolve it once at runtime instead
-+        // see http://bugs.linuxbase.org/show_bug.cgi?id=2364
-+        typedef int (*GetAttrPtr)(pthread_t, pthread_attr_t *);
-+        static int (*pthread_getattr_np_ptr)(pthread_t, pthread_attr_t *) = 0;
-+        if (!pthread_getattr_np_ptr)
-+            *(void **)&pthread_getattr_np_ptr = dlsym(RTLD_DEFAULT, "pthread_getattr_np");
-+#endif
-         pthread_attr_t sattr;
-         pthread_attr_init(&sattr);
- #if HAVE(PTHREAD_NP_H) || OS(NETBSD)
-         // e.g. on FreeBSD 5.4, neundorf@kde.org
-         pthread_attr_get_np(thread, &sattr);
-+#elif defined(QT_LINUXBASE)
-+        if (pthread_getattr_np_ptr)
-+            pthread_getattr_np_ptr(thread, &sattr);
- #else
-         // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
-         pthread_getattr_np(thread, &sattr);
-@@ -671,6 +731,7 @@
-         stackThread = thread;
-     }
-     return static_cast<char*>(stackBase) + stackSize;
-+#endif
- #else
- #error Need a way to get the stack base on this platform
- #endif
diff --git a/package/qt/0006-script-qtdbus-no-gui.patch b/package/qt/0006-script-qtdbus-no-gui.patch
deleted file mode 100644
index e29e9e4a1b..0000000000
--- a/package/qt/0006-script-qtdbus-no-gui.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-[PATCH] fix build with script+dbus enabled, but no gui
-
-The script/qtdbus plugin doesn't need gui support, so don't try to
-link it against libQtGui.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/plugins/script/qtdbus/qtdbus.pro |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro
-===================================================================
---- qt-4.7.3.orig/src/plugins/script/qtdbus/qtdbus.pro
-+++ qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro
-@@ -1,6 +1,6 @@
- TARGET  = qtscriptdbus
- include(../../qpluginbase.pri)
--QT = core gui script
-+QT = core script
- CONFIG += qdbus
- 
- SOURCES += main.cpp
diff --git a/package/qt/0007-Add-initial-support-of-ARC-architecture.patch b/package/qt/0007-Add-initial-support-of-ARC-architecture.patch
deleted file mode 100644
index 4470d3b0df..0000000000
--- a/package/qt/0007-Add-initial-support-of-ARC-architecture.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From a695eec2ef21240bbc6cd8cd1bdbab76f8da8dfd Mon Sep 17 00:00:00 2001
-From: Vineet Gupta <vgupta@synopsys.com>
-Date: Wed, 20 May 2015 10:37:25 +0300
-Subject: [PATCH 1/2] Add initial support of ARC architecture
-
-DesignWare ARC 700 and ARC HS38 are families of 32-bit CPUs
-developed by Synopsys, Inc.
-
-This change implements following:
- [1] Defines ARC as one embedded targets
- [2] Defines default tools prefixed for ARC like
-     arc-linux-g++ etc
- [3] Defines "inotify" syscall numbers for ARC
-     (note ARC fully compliant to Linux UAPI headers)
- [4] Disables 16-bit aligned data access
-
-For now we're using generic atomic ops even though it may
-introduce performance panalty.
-
-Change-Id: I91e879ac55c2f3643a544f97cd59671a81ccc3c2
-
-This patch was submited in upstream Qt4 and if it ever gets accepted,
-it should be removed from Buildroot.
-
-https://codereview.qt-project.org/#/c/112667
----
- configure                                     |  6 ++++
- mkspecs/qws/linux-arc-g++/qmake.conf          | 21 ++++++++++++++
- mkspecs/qws/linux-arc-g++/qplatformdefs.h     | 42 +++++++++++++++++++++++++++
- src/corelib/arch/qatomic_arch.h               |  2 ++
- src/corelib/io/qfilesystemwatcher_inotify.cpp |  5 ++++
- src/gui/painting/qblendfunctions.cpp          |  4 +--
- 6 files changed, 78 insertions(+), 2 deletions(-)
- create mode 100644 mkspecs/qws/linux-arc-g++/qmake.conf
- create mode 100644 mkspecs/qws/linux-arc-g++/qplatformdefs.h
-
-diff --git a/configure b/configure
-index 10ad7ca..c7ef074 100755
---- a/configure
-+++ b/configure
-@@ -2829,6 +2829,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then
-                     *86_64)
-                         CFG_EMBEDDED=x86_64
-                         ;;
-+                    *arc)
-+                        CFG_EMBEDDED=arc
-+                        ;;
-                     *)
-                         CFG_EMBEDDED=generic
-                         ;;
-@@ -3309,6 +3312,9 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
-     arm*)
-         CFG_ARCH=arm
-         ;;
-+    arc)
-+        CFG_ARCH=arc
-+        ;;
-     *)
-         CFG_ARCH="$CFG_EMBEDDED"
-         ;;
-diff --git a/mkspecs/qws/linux-arc-g++/qmake.conf b/mkspecs/qws/linux-arc-g++/qmake.conf
-new file mode 100644
-index 0000000..a14587b
---- /dev/null
-+++ b/mkspecs/qws/linux-arc-g++/qmake.conf
-@@ -0,0 +1,21 @@
-+#
-+# qmake configuration for building with arc-linux-g++
-+#
-+
-+include(../../common/linux.conf)
-+include(../../common/gcc-base-unix.conf)
-+include(../../common/g++-unix.conf)
-+include(../../common/qws.conf)
-+
-+# modifications to g++.conf
-+QMAKE_CC                = arc-linux-gcc
-+QMAKE_CXX               = arc-linux-g++
-+QMAKE_LINK              = arc-linux-g++
-+QMAKE_LINK_SHLIB        = arc-linux-g++
-+
-+# modifications to linux.conf
-+QMAKE_AR                = arc-linux-ar cqs
-+QMAKE_OBJCOPY           = arc-linux-objcopy
-+QMAKE_STRIP             = arc-linux-strip
-+
-+load(qt_config)
-diff --git a/mkspecs/qws/linux-arc-g++/qplatformdefs.h b/mkspecs/qws/linux-arc-g++/qplatformdefs.h
-new file mode 100644
-index 0000000..a654aa7
---- /dev/null
-+++ b/mkspecs/qws/linux-arc-g++/qplatformdefs.h
-@@ -0,0 +1,42 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2015 The Qt Company Ltd.
-+** Contact: http://www.qt.io/licensing/
-+**
-+** This file is part of the qmake spec of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see http://www.qt.io/terms-conditions. For further
-+** information use the contact form at http://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 or version 3 as published by the Free
-+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-+** following information to ensure the GNU Lesser General Public License
-+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** As a special exception, The Qt Company gives you certain additional
-+** rights. These rights are described in The Qt Company LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "../../linux-g++/qplatformdefs.h"
-diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h
-index d154b7e..a48c42a 100644
---- a/src/corelib/arch/qatomic_arch.h
-+++ b/src/corelib/arch/qatomic_arch.h
-@@ -94,6 +94,8 @@ QT_BEGIN_HEADER
- #  include "QtCore/qatomic_sh4a.h"
- #elif defined(QT_ARCH_NACL)
- #  include "QtCore/qatomic_generic.h"
-+#elif defined(QT_ARCH_ARC)
-+#  include "QtCore/qatomic_generic.h"
- #else
- #  error "Qt has not been ported to this architecture"
- #endif
-diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
-index 8bca422..e3e2565 100644
---- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
-+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
-@@ -143,6 +143,11 @@
- # define __NR_inotify_add_watch 27
- # define __NR_inotify_rm_watch  28
- // no inotify_init for aarch64
-+#elif defined (__arc__)
-+# define __NR_inotify_init      1043
-+# define __NR_inotify_add_watch 27
-+# define __NR_inotify_rm_watch  28
-+# define __NR_inotify_init1     26
- #else
- # error "This architecture is not supported. Please talk to qt-bugs at trolltech.com"
- #endif
-diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp
-index de8790a..cc2f5b6 100644
---- a/src/gui/painting/qblendfunctions.cpp
-+++ b/src/gui/painting/qblendfunctions.cpp
-@@ -309,9 +309,9 @@ template <typename T> void qt_blend_argb24_on_rgb16(uchar *destPixels, int dbpl,
-         const uchar *src = srcPixels + y * sbpl;
-         const uchar *srcEnd = src + srcOffset;
-         while (src < srcEnd) {
--#if defined(QT_ARCH_ARMV5) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) || (defined(QT_ARCH_INTEGRITY) && !defined(_X86_))
-+#if defined(QT_ARCH_ARMV5) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) || (defined(QT_ARCH_INTEGRITY) && !defined(_X86_)) || defined(QT_ARCH_ARC)
-             // non-16-bit aligned memory access is not possible on PowerPC,
--            // ARM <v6 (QT_ARCH_ARMV5) & SH & AVR32 & SPARC w/GCC
-+            // ARM <v6 (QT_ARCH_ARMV5) & SH & AVR32 & SPARC w/GCC & ARC
-             quint16 spix = (quint16(src[2])<<8) + src[1];
- #else
-             quint16 spix = *(quint16 *) (src + 1);
--- 
-2.1.0
-
diff --git a/package/qt/0008-Prevent-unaligned-access-on-ARC.patch b/package/qt/0008-Prevent-unaligned-access-on-ARC.patch
deleted file mode 100644
index 684a5b494b..0000000000
--- a/package/qt/0008-Prevent-unaligned-access-on-ARC.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 9392d29bf0ad0390c6895933fdec0f690d2bdedf Mon Sep 17 00:00:00 2001
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Date: Wed, 20 May 2015 10:53:59 +0300
-Subject: [PATCH 2/2] Prevent unaligned access on ARC
-
-As many other architectures ARC cores by default don't support
-unaligned word access to data.
-
-Even though it's possible to enable unaligned access to data in
-ARC HS38 core (we're talking about configuration of core design)
-to make sure Qt could be executed on any flavour of ARC fall-back
-to byte-accesses is used.
-
-Change-Id: I96068d40b449f11ba987ed1e5d5e44f493d1eb5f
-
-This patch was submited in upstream Qt4 and if it ever gets accepted,
-it should be removed from Buildroot.
-
-https://codereview.qt-project.org/#/c/112668
----
- src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h |  2 +-
- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h    | 13 ++++++++++++-
- .../webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp  |  2 +-
- .../webkit/Source/JavaScriptCore/wtf/text/StringHash.h      |  2 +-
- 4 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h
-index 2d76809..ee9b7f0 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h
-@@ -202,7 +202,7 @@ struct UStringHash {
- 
-         // FIXME: perhaps we should have a more abstract macro that indicates when
-         // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC)
-+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(ARC)
-         const UChar* aChars = a->characters();
-         const UChar* bChars = b->characters();
-         for (unsigned i = 0; i != aLength; ++i) {
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-index e8b03be..cd17e9c 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-@@ -369,7 +369,18 @@
- 
- #endif /* ARM */
- 
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
-+/* CPU(ARC) - ARC, any version*/
-+#if   defined(arc) \
-+    || defined(__arc__) \
-+    || defined(ARC) \
-+    || defined(_ARC_)
-+#define WTF_CPU_ARC 1
-+#if defined(__BIG_ENDIAN__)
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+#endif
-+
-+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ARC)
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
- 
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-index 9dd655e..bd3ab95 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp
-@@ -142,7 +142,7 @@ static inline bool equal(StringImpl* string, const UChar* characters, unsigned l
- 
-     // FIXME: perhaps we should have a more abstract macro that indicates when
-     // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC)
-+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(ARC)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h
-index 4637c3d..91cef81 100644
---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h
-+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h
-@@ -55,7 +55,7 @@ namespace WTF {
- 
-             // FIXME: perhaps we should have a more abstract macro that indicates when
-             // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC)
-+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(ARC)
-             const UChar* aChars = a->characters();
-             const UChar* bChars = b->characters();
-             for (unsigned i = 0; i != aLength; ++i) {
--- 
-2.1.0
-
diff --git a/package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch b/package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch
deleted file mode 100644
index d7d387a78d..0000000000
--- a/package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From ea46f47fb3c475ba2d7581c15185b8d43e63b8c2 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Fri, 27 Feb 2015 21:30:52 +0100
-Subject: [PATCH] Fix conversion/constructor error for legacy c++ compiler.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes the following compile error with legacy c++ compiler:
-
-error: in C++98 ?blitRect? must be initialized by constructor, not by ?{...}?
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp   | 14 +++++++-------
- src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp        |  6 +++---
- src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp        |  6 +++---
- src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp |  2 +-
- 4 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
-index 876d0c2..ed69386 100644
---- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
-+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
-@@ -942,7 +942,7 @@ void QDirectFBPaintEngine::drawBufferSpan(const uint *buffer, int bufsize,
-     IDirectFBSurface *src = d->surfaceCache->getSurface(buffer, bufsize);
-     // ### how does this play with setDFBColor
-     src->SetColor(src, 0, 0, 0, const_alpha);
--    const DFBRectangle rect = { 0, 0, length, 1 };
-+    const DFBRectangle rect = (DFBRectangle_C){ 0, 0, length, 1 };
-     d->surface->Blit(d->surface, src, &rect, x, y);
- }
- 
-@@ -1223,14 +1223,14 @@ void QDirectFBPaintEnginePrivate::blit(const QRectF &dest, IDirectFBSurface *s,
-     const QRect dr = engine->state()->matrix.mapRect(dest).toRect();
-     if (dr.isEmpty())
-         return;
--    const DFBRectangle sRect = { sr.x(), sr.y(), sr.width(), sr.height() };
-+    const DFBRectangle sRect = (DFBRectangle_C){ sr.x(), sr.y(), sr.width(), sr.height() };
-     DFBResult result;
- 
-     if (dr.size() == sr.size()) {
-         result = surface->Blit(surface, s, &sRect, dr.x(), dr.y());
-     } else {
-         Q_ASSERT(supportsStretchBlit());
--        const DFBRectangle dRect = { dr.x(), dr.y(), dr.width(), dr.height() };
-+        const DFBRectangle dRect = (DFBRectangle_C){ dr.x(), dr.y(), dr.width(), dr.height() };
-         result = surface->StretchBlit(surface, s, &sRect, &dRect);
-     }
-     if (result != DFB_OK)
-@@ -1261,7 +1261,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
-     if (newClip.isNull())
-         return;
- 
--    const DFBRegion clip = {
-+    const DFBRegion clip = (DFBRegion_C){
-         newClip.x(),
-         newClip.y(),
-         newClip.right(),
-@@ -1295,7 +1295,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
-         while (y <= destinationRect.bottom()) {
-             qreal x = startX;
-             while (x <= destinationRect.right()) {
--                const DFBRectangle destination = { qRound(x), qRound(y), mappedSize.width(), mappedSize.height() };
-+                const DFBRectangle destination = (DFBRectangle_C){ qRound(x), qRound(y), (int)mappedSize.width(), (int)mappedSize.height() };
-                 surface->StretchBlit(surface, sourceSurface, 0, &destination);
-                 x += mappedSize.width();
-             }
-@@ -1337,7 +1337,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
-     if (currentClip.isEmpty()) {
-         surface->SetClip(surface, 0);
-     } else {
--        const DFBRegion clip = {
-+        const DFBRegion clip = (DFBRegion_C){
-             currentClip.x(),
-             currentClip.y(),
-             currentClip.right(),
-@@ -1356,7 +1356,7 @@ void QDirectFBPaintEnginePrivate::updateClip()
-         surface->SetClip(surface, NULL);
-         clipType = NoClip;
-     } else if (clipData->hasRectClip) {
--        const DFBRegion r = {
-+        const DFBRegion r = (DFBRegion_C){
-             clipData->clipRect.x(),
-             clipData->clipRect.y(),
-             clipData->clipRect.right(),
-diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
-index 412e684..c59c47d 100644
---- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
-+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
-@@ -363,7 +363,7 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect)
-     } else {
-         dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
-     }
--    const DFBRectangle blitRect = { rect.x(), rect.y(),
-+    const DFBRectangle blitRect = (DFBRectangle_C){ rect.x(), rect.y(),
-                                     rect.width(), rect.height() };
-     w = rect.width();
-     h = rect.height();
-@@ -465,7 +465,7 @@ QPixmap QDirectFBPixmapData::transformed(const QTransform &transform,
-     }
-     data->dfbSurface->SetBlittingFlags(data->dfbSurface, flags);
- 
--    const DFBRectangle destRect = { 0, 0, size.width(), size.height() };
-+    const DFBRectangle destRect = (DFBRectangle_C){ 0, 0, size.width(), size.height() };
-     data->dfbSurface->StretchBlit(data->dfbSurface, dfbSurface, 0, &destRect);
-     data->w = size.width();
-     data->h = size.height();
-@@ -551,7 +551,7 @@ bool QDirectFBPixmapData::scroll(int dx, int dy, const QRect &rect)
-         return false;
-     }
- 
--    const DFBRectangle source = { rect.x(), rect.y(), rect.width(), rect.height() };
-+    const DFBRectangle source = (DFBRectangle_C){ rect.x(), rect.y(), rect.width(), rect.height() };
-     result = dfbSurface->Blit(dfbSurface, dfbSurface, &source, source.x + dx, source.y + dy);
-     if (result != DFB_OK) {
-         DirectFBError("QDirectFBPixmapData::scroll", result);
-diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
-index eab9580..d26e5bf 100644
---- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
-+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
-@@ -1635,7 +1635,7 @@ void QDirectFBScreen::solidFill(const QColor &color, const QRegion &region)
- static inline void clearRect(IDirectFBSurface *surface, const QColor &color, const QRect &rect)
- {
-     Q_ASSERT(surface);
--    const DFBRegion region = { rect.left(), rect.top(), rect.right(), rect.bottom() };
-+    const DFBRegion region = (DFBRegion_C){ rect.left(), rect.top(), rect.right(), rect.bottom() };
-     // could just reinterpret_cast this to a DFBRegion
-     surface->SetClip(surface, &region);
-     surface->Clear(surface, color.red(), color.green(), color.blue(), color.alpha());
-@@ -1716,14 +1716,14 @@ void QDirectFBScreen::flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags
-             const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT;
-             for (int i=0; i<rects.size(); ++i) {
-                 const QRect &r = rects.at(i);
--                const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
-+                const DFBRegion dfbReg = (DFBRegion_C){ r.x() + offset.x(), r.y() + offset.y(),
-                                            r.right() + offset.x(),
-                                            r.bottom() + offset.y() };
-                 surface->Flip(surface, &dfbReg, i + 1 < rects.size() ? nonWaitFlags : flipFlags);
-             }
-         } else {
-             const QRect r = region.boundingRect();
--            const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
-+            const DFBRegion dfbReg = (DFBRegion_C){ r.x() + offset.x(), r.y() + offset.y(),
-                                        r.right() + offset.x(),
-                                        r.bottom() + offset.y() };
-             surface->Flip(surface, &dfbReg, flipFlags);
-diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
-index 4dff907..25ad06b 100644
---- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
-+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
-@@ -333,7 +333,7 @@ bool QDirectFBWindowSurface::scroll(const QRegion &region, int dx, int dy)
-     }
-     dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
-     const QRect r = region.boundingRect();
--    const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() };
-+    const DFBRectangle rect = (DFBRectangle_C){ r.x(), r.y(), r.width(), r.height() };
-     dfbSurface->Blit(dfbSurface, dfbSurface, &rect, r.x() + dx, r.y() + dy);
-     return true;
- }
--- 
-2.1.4
-
diff --git a/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch b/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
deleted file mode 100644
index 9b1655322a..0000000000
--- a/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0bf90de93b9fe21df32319e27b2507154fa8a21d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Fri, 15 Apr 2016 00:37:26 +0200
-Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
-only when its glibc < 2 and not also for the libraries which may define
-it as per standards but are not glibc, e.g. musl.
-
-This patch is adapted from Qt5 [1].
-
-[1]
-https://github.com/qtproject/qtbase/commit/813f468a14fb84af43c1f8fc0a1430277358eba2
-
-Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
----
- mkspecs/linux-g++/qplatformdefs.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
-index de751dd..d4146ed 100644
---- a/mkspecs/linux-g++/qplatformdefs.h
-+++ b/mkspecs/linux-g++/qplatformdefs.h
-@@ -86,10 +86,10 @@
- 
- #undef QT_SOCKLEN_T
- 
--#if defined(__GLIBC__) && (__GLIBC__ >= 2)
--#define QT_SOCKLEN_T            socklen_t
--#else
-+#if defined(__GLIBC__) && (__GLIBC__ < 2)
- #define QT_SOCKLEN_T            int
-+#else
-+#define QT_SOCKLEN_T            socklen_t
- #endif
- 
- #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
--- 
-2.8.0
-
diff --git a/package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch b/package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch
deleted file mode 100644
index f3d47f754e..0000000000
--- a/package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 438f088ad520ac91ae47dba9a515ab0d1088c89c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Fri, 15 Apr 2016 03:32:02 +0200
-Subject: [PATCH] Link with -ldl option only when it is supported
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-`-ldl` option is used unconditionally in `QMAKE_LIBS_DYNLOAD` while libdl is
-not supported when libc is static. As the value of `QMAKE_LIBS_DYNLOAD` goes
-into 'Libs.private' field of the pkgconfig files created by qmake, static
-linking with qt will fail with:
-  /usr/bin/ld: cannot find -ldl
-
-Fix this issue by adding a build test to configure to check if libdl is
-supported. `QMAKE_LIBS_DYNLOAD` in "src/corelib/plugin/plugin.pri" is now used
-only if libdl is available.
-
-Backported from Qt5:
-https://github.com/qtproject/qtbase/commit/f669ea0d54302de31456d57286aa0e4ca1443e98
-
-Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
----
- config.tests/unix/libdl/libdl.cpp | 39 +++++++++++++++++++++++++++++++++++++++
- config.tests/unix/libdl/libdl.pro |  3 +++
- configure                         |  6 ++++++
- src/corelib/plugin/plugin.pri     |  2 +-
- 4 files changed, 49 insertions(+), 1 deletion(-)
- create mode 100644 config.tests/unix/libdl/libdl.cpp
- create mode 100644 config.tests/unix/libdl/libdl.pro
-
-diff --git a/config.tests/unix/libdl/libdl.cpp b/config.tests/unix/libdl/libdl.cpp
-new file mode 100644
-index 0000000..28a8233
---- /dev/null
-+++ b/config.tests/unix/libdl/libdl.cpp
-@@ -0,0 +1,39 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2015 The Qt Company Ltd.
-+** Contact: http://www.qt.io/licensing/
-+**
-+** This file is part of the config.tests of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL21$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see http://www.qt.io/terms-conditions. For further
-+** information use the contact form at http://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 or version 3 as published by the Free
-+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-+** following information to ensure the GNU Lesser General Public License
-+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** As a special exception, The Qt Company gives you certain additional
-+** rights. These rights are described in The Qt Company LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include <dlfcn.h>
-+
-+int main(int, char **)
-+{
-+    dlopen(0, 0);
-+}
-diff --git a/config.tests/unix/libdl/libdl.pro b/config.tests/unix/libdl/libdl.pro
-new file mode 100644
-index 0000000..a643934
---- /dev/null
-+++ b/config.tests/unix/libdl/libdl.pro
-@@ -0,0 +1,3 @@
-+SOURCES = libdl.cpp
-+CONFIG -= qt dylib
-+LIBS += -ldl
-\ No newline at end of file
-diff --git a/configure b/configure
-index 10ad7ca..1c70691 100755
---- a/configure
-+++ b/configure
-@@ -5506,6 +5506,12 @@ if [ "$CFG_LIBPNG" = "auto" ]; then
-     fi
- fi
- 
-+# detect dl
-+if ! compileTest unix/libdl "libdl"; then
-+    QMakeVar add DEFINES QT_NO_DYNAMIC_LIBRARY
-+    QMAKE_CONFIG="$QMAKE_CONFIG no-libdl"
-+fi
-+
- # detect accessibility
- if [ "$CFG_ACCESSIBILITY" = "auto" ]; then
-     if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
-diff --git a/src/corelib/plugin/plugin.pri b/src/corelib/plugin/plugin.pri
-index eb7a7f7..c342f2e 100644
---- a/src/corelib/plugin/plugin.pri
-+++ b/src/corelib/plugin/plugin.pri
-@@ -32,4 +32,4 @@ integrity {
- 	SOURCES += plugin/qlibrary_unix.cpp
- }
- 
--LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD
-+!no-libdl: LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD
--- 
-2.8.0
-
diff --git a/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch b/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch
deleted file mode 100644
index 8c65d1db38..0000000000
--- a/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 87c9c18fad02744238336a6cf1ce70d3ec2c89c2 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sat, 11 Jun 2016 17:03:07 +0200
-Subject: [PATCH 1/1] OpenGL/EGL: Avoid X11 header collision
-
-Including X11 headers via EGL/egl.h leads to a collision of defines
-between Qt and X11. To fix this qt5 added
-  DEFINES += MESA_EGL_NO_X11_HEADERS
-in various files:
-
-https://github.com/qtproject/qtbase/blob/dev/src/platformsupport/eglconvenience/eglconvenience.pri#L19
-https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/minimalegl/minimalegl.pro#L10
-https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro#L6
-[...]
-
-This patch fixes a similar compile error in qt4:
-http://autobuild.buildroot.net/results/9b0/9b0ed92984eead89d148eaa71aff6e2f1e117837/
-http://autobuild.buildroot.org/results/4fd/4fd57553336d36439fab32a7221fc8639758e887/
-http://autobuild.buildroot.org/results/5cb/5cb8072f8220f7203fa79936eedcc43eab53ec66/
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(patch not sent upstream because qt4 branch is closed:
- http://blog.qt.io/blog/2015/05/26/qt-4-8-7-released/)
----
-
- src/gui/egl/egl.pri   | 3 +++
- src/opengl/opengl.pro | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
-index 8e8664c..715ffd7 100644
---- a/src/gui/egl/egl.pri
-+++ b/src/gui/egl/egl.pri
-@@ -22,6 +22,9 @@ contains(QT_CONFIG, egl): {
-             !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
-         }
- 
-+	# Avoid X11 header collision
-+	DEFINES += MESA_EGL_NO_X11_HEADERS
-+
- 	wince*: SOURCES += egl/qegl_wince.cpp
- 
- 	unix {
-diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
-index ce1a5d2..65b1031 100644
---- a/src/opengl/opengl.pro
-+++ b/src/opengl/opengl.pro
-@@ -149,6 +149,9 @@ embedded {
-                qglwindowsurface_qws_p.h \
-                qgl_egl_p.h
- 
-+    # Avoid X11 header collision
-+    DEFINES += MESA_EGL_NO_X11_HEADERS
-+
-     contains(QT_CONFIG, fontconfig) {
-         include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
-     } else {
--- 
-2.8.1
-
diff --git a/package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch b/package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch
deleted file mode 100644
index 645041acfe..0000000000
--- a/package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2281fa50f6e13278d3fd4f028377b8249b7b3cdb Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 8 Sep 2017 09:06:54 +0200
-Subject: [PATCH] src/corelib/arch/qatomic_arm.h: fix build on ARMv8 32-bit
-
-The Qt build fails on ARMv8 32-bit because it falls back to using the
-ARMv5 code that uses the swp instruction, which no longer exists:
-
-/tmp/ccSxVIzw.s: Assembler messages:
-/tmp/ccSxVIzw.s:127: Error: swp{b} use is obsoleted for ARMv8 and later
-/tmp/ccSxVIzw.s:190: Error: swp{b} use is obsoleted for ARMv8 and later
-
-So, this commit adjusts the ARM atomic code to assume ARMv8 is similar
-to ARMv7.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/corelib/arch/qatomic_arm.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h
-index 77cd66f272..e011929d3e 100644
---- a/src/corelib/arch/qatomic_arm.h
-+++ b/src/corelib/arch/qatomic_arm.h
-@@ -47,7 +47,8 @@ QT_BEGIN_HEADER
- #if defined(__ARM_ARCH_7__) \
-     || defined(__ARM_ARCH_7A__) \
-     || defined(__ARM_ARCH_7R__) \
--    || defined(__ARM_ARCH_7M__)
-+    || defined(__ARM_ARCH_7M__) \
-+    || defined(__ARM_ARCH_8A__)
- # define QT_ARCH_ARMV7
- QT_BEGIN_INCLUDE_HEADER
- # include "QtCore/qatomic_armv7.h"
--- 
-2.13.5
-
diff --git a/package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch b/package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch
deleted file mode 100644
index 1e555e721f..0000000000
--- a/package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From f566411fb314b7e4ab01f28e25e942cfaf8c59b7 Mon Sep 17 00:00:00 2001
-From: Evgeniy Didin <didin@synopsys.com>
-Date: Fri, 15 Sep 2017 19:43:48 +0300
-Subject: [PATCH] qt: Allow enabling of QtWebKit with GCC 6+
-
-Building Qt with QtWebKit on configuration step there is
-a check which disables QtWebKit build with GCC 6+.
-Back in the day nobody thought about building Qt with GCC
-version greater than 5.x. And now with modern GCCs like
-6.x and 7.x this assumption gets in the way.
-
-Given in Buildroot today we don't have GCC older than 4.9 
-it should be safe to remove now meaningless check completely.
-
-Signed-off-by: Evgeniy Didin <didin@synopsys.com>
-Cc: Alexey Brodkin <abrodkin@synopsys.com>
-Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- configure | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/configure b/configure
-index 10ad7ca0b0..8771144a65 100755
---- a/configure
-+++ b/configure
-@@ -7731,20 +7731,6 @@ case "$XPLATFORM" in
- 	canBuildWebKit="no"
- 	canBuildQtXmlPatterns="no"
- 	;;
--    *-g++*)
--	# Check gcc's version
--	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
--	    5*|4*|3.4*)
--		;;
--            3.3*)
--                canBuildWebKit="no"
--                ;;
--	    *)
--		canBuildWebKit="no"
--		canBuildQtXmlPatterns="no"
--		;;
--	esac
--	;;
-     solaris-cc*)
-         # Check the compiler version
-         case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in
--- 
-2.11.0
-
diff --git a/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch b/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch
deleted file mode 100644
index a5995484c8..0000000000
--- a/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 02e9698c96ca78342b82fa7239e93bab4aa45db2 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 17 Nov 2017 22:20:06 +0100
-Subject: [PATCH] configure: fix build on non-x86 platforms
-
-When building for an uncommon platform on a ppc64le machine, Qt build
-fails because it builds qmake with the target compiler instead of
-using the host compiler. This is due to the fact that Qt configure
-script believes that both the host and target platforms are "powerpc",
-even though the target really is Xtensa or ARC for example.
-
-Qt's configure script defines a variable called PLATFORM that points to
-the mkspecs describing the host machine. For x86, its value is
-qws/linux-x86-g++ and for x86-64, its value is
-qws/linux-x86_64-g++. For any other host architecture, its value is
-qws/linux-generic-g++.
-
-In parallel to this, Qt's configure script defines a variable called
-XPLATFORM that points to the mkspecs describing the target machine. It
-points to qws/linux-${CFG_EMBEDDED}-g++, where CFG_EMBEDDED is
-simply "generic" for most uncommon architectures.
-
-Therefore, when we're building for an uncommon architecture, on a
-ppc64le machine, we have:
-
-  PLATFORM = qws/linux-generic-g++
-  XPLATFORM = qws/linux-generic-g++
-
-i.e, both values are equal. Due to this, the following condition is
-false:
-
-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
-
-which causes Qt's configure script to fallback to:
-
-elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
-    CFG_ARCH=$CFG_HOST_ARCH
-fi
-
-because CFG_ARCH is not defined, and therefore gets defined to
-CFG_HOST_ARCH. So we have CFG_ARCH == CFG_HOST_ARCH, and Qt believes
-we're doing a native build.
-
-Therefore, we need to ensure that PLATFORM and XPLATFORM always have a
-different value. To achieve this, we create a
-qws/linux-host-generic-g++ mkspecs, which is always used as
-PLATFORM. It is identical to qws/linux-x86-g++. Compared to
-qws/linux-x86_64-g++, the only difference is that we're not passing
-the -m64 flag, but that isn't needed when building host tools.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure                                          |  8 +----
- mkspecs/qws/linux-host-generic-g++/qmake.conf      | 10 ++++++
- mkspecs/qws/linux-host-generic-g++/qplatformdefs.h | 42 ++++++++++++++++++++++
- 3 files changed, 53 insertions(+), 7 deletions(-)
- create mode 100644 mkspecs/qws/linux-host-generic-g++/qmake.conf
- create mode 100644 mkspecs/qws/linux-host-generic-g++/qplatformdefs.h
-
-diff --git a/configure b/configure
-index 10ad7ca0b0..d25f90be1e 100755
---- a/configure
-+++ b/configure
-@@ -2806,14 +2806,8 @@ if [ "$CFG_EMBEDDED" != "no" ]; then
-     Linux:*)
-         if [ -z "$PLATFORM" ]; then
-             case "$UNAME_MACHINE" in
--            *86)
--                PLATFORM=qws/linux-x86-g++
--                ;;
--            *86_64)
--                PLATFORM=qws/linux-x86_64-g++
--                ;;
-             *)
--                PLATFORM=qws/linux-generic-g++
-+                PLATFORM=qws/linux-host-generic-g++
-                 ;;
-             esac
-         fi
-diff --git a/mkspecs/qws/linux-host-generic-g++/qmake.conf b/mkspecs/qws/linux-host-generic-g++/qmake.conf
-new file mode 100644
-index 0000000000..55011ec52b
---- /dev/null
-+++ b/mkspecs/qws/linux-host-generic-g++/qmake.conf
-@@ -0,0 +1,10 @@
-+#
-+# qmake configuration for building with linux-g++
-+#
-+
-+include(../../common/linux.conf)
-+include(../../common/gcc-base-unix.conf)
-+include(../../common/g++-unix.conf)
-+include(../../common/qws.conf)
-+
-+load(qt_config)
-diff --git a/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h b/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h
-new file mode 100644
-index 0000000000..a654aa78a2
---- /dev/null
-+++ b/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h
-@@ -0,0 +1,42 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2015 The Qt Company Ltd.
-+** Contact: http://www.qt.io/licensing/
-+**
-+** This file is part of the qmake spec of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see http://www.qt.io/terms-conditions. For further
-+** information use the contact form at http://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 or version 3 as published by the Free
-+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-+** following information to ensure the GNU Lesser General Public License
-+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** As a special exception, The Qt Company gives you certain additional
-+** rights. These rights are described in The Qt Company LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "../../linux-g++/qplatformdefs.h"
--- 
-2.13.6
-
diff --git a/package/qt/Config.gfx.in b/package/qt/Config.gfx.in
deleted file mode 100644
index 5e6619c7b8..0000000000
--- a/package/qt/Config.gfx.in
+++ /dev/null
@@ -1,31 +0,0 @@
-menu "Graphics drivers"
-
-config BR2_PACKAGE_QT_GFX_LINUXFB
-	bool "Linux Framebuffer"
-	default y
-
-config BR2_PACKAGE_QT_GFX_TRANSFORMED
-	bool "Transformed"
-
-config BR2_PACKAGE_QT_GFX_QVFB
-	bool "Qt Virtual Framebuffer"
-
-config BR2_PACKAGE_QT_GFX_VNC
-	bool "VNC"
-
-config BR2_PACKAGE_QT_GFX_MULTISCREEN
-	bool "multiscreen"
-
-comment "directfb Qt driver not available (need directfb)"
-	depends on !BR2_PACKAGE_DIRECTFB
-
-config BR2_PACKAGE_QT_GFX_DIRECTFB
-	bool "directFB"
-	depends on BR2_PACKAGE_DIRECTFB
-
-config BR2_PACKAGE_QT_GFX_POWERVR
-	bool "powervr"
-	depends on BR2_PACKAGE_QT_OPENGL_ES
-	depends on BR2_PACKAGE_HAS_POWERVR
-
-endmenu
diff --git a/package/qt/Config.in b/package/qt/Config.in
deleted file mode 100644
index a1218ecf39..0000000000
--- a/package/qt/Config.in
+++ /dev/null
@@ -1,543 +0,0 @@
-comment "qt needs a toolchain w/ C++, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-
-menuconfig BR2_PACKAGE_QT
-	bool "Qt (obsolete)"
-	depends on BR2_USE_MMU # fork
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	help
-	  Qt is a cross-platform application and UI framework for
-	  developers using C++.
-
-	  http://qt-project.org
-
-if BR2_PACKAGE_QT
-
-choice
-	prompt "Qt installation"
-	help
-	  Selects the type of installation: standard or embedded
-
-config BR2_PACKAGE_QT_EMBEDDED
-	bool "Qt embedded"
-	help
-	  The embedded Qt installation targets embedded systems
-	  without X.org. Provides backends for framebuffer.
-	  If unsure, say Y.
-
-comment "Qt standard (X11) not available (need X.org)"
-	depends on !BR2_PACKAGE_XORG7
-
-config BR2_PACKAGE_QT_X11
-	bool "Qt standard (X11)"
-	depends on BR2_PACKAGE_XORG7
-	select BR2_PACKAGE_FONTCONFIG
-	select BR2_PACKAGE_XLIB_LIBXI
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXRENDER
-	select BR2_PACKAGE_XLIB_LIBXCURSOR
-	select BR2_PACKAGE_XLIB_LIBXRANDR
-	select BR2_PACKAGE_XLIB_LIBXEXT
-	select BR2_PACKAGE_XLIB_LIBXV
-	select BR2_PACKAGE_QT_SYSTEMFREETYPE
-	select BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  The standard Qt installation provides X.org backend. If you
-	  don't want to use X.org, say N.
-
-endchoice
-
-config BR2_PACKAGE_QT_DEBUG
-	bool "Compile with debug support"
-	help
-	  If unsure, say N.
-
-config BR2_PACKAGE_QT_DEMOS
-	bool "Compile and install Qt demos (with code)"
-	select BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  If unsure, say N.
-
-config BR2_PACKAGE_QT_TRANSLATION_FILES
-	bool "Install translation files"
-	help
-	  Install binary .qm translation files.
-	  Say y if you need these files. They will take about 8 MB
-	  on the target root filesystem.
-
-config BR2_PACKAGE_QT_EXAMPLES
-	bool "Compile and install Qt examples (with code)"
-	select BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  If unsure, say N.
-
-choice
-	prompt "Library type"
-	help
-	  Selects the library type: Shared or Static
-
-config BR2_PACKAGE_QT_SHARED
-	bool "Shared library"
-	depends on !BR2_STATIC_LIBS
-	help
-	  Create and use shared Qt libraries.
-	  If you have multiple programs that depend on Qt or intend to
-	  use plugins, say Y.
-
-config BR2_PACKAGE_QT_STATIC
-	bool "Static Library"
-	help
-	  Create and use static Qt libraries.
-	  If you don't have multiple programs on the target that
-	  depends on Qt, then this will save you quite some of storage
-	  space.
-	  If unsure, say Y.
-
-endchoice
-
-config BR2_PACKAGE_QT_CONFIG_FILE
-	string "Config file"
-	help
-	  Configure options allow to set which modules are being
-	  compiled or not in Qt, but Qt also provide a more
-	  fine-grained mechanism to configure which features should be
-	  enabled or disabled, through a header file. Examples of such
-	  header files can be found in src/corelib/global/qconfig-*.h
-	  in the Qt sources.
-
-	  This option allows to set the path of such a configuration
-	  file, which Buildroot will give to Qt at compile time.
-
-config BR2_PACKAGE_QT_QT3SUPPORT
-	bool "Compatibility with Qt3"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	select BR2_PACKAGE_QT_SQL_MODULE
-	help
-	  Turns on support for older Qt3. This will create an
-	  additional library with proxy code and increase the space
-	  required on target.  If unsure say n.
-
-config BR2_PACKAGE_QT_GUI_MODULE
-	bool "Gui Module"
-	default y
-	select BR2_PACKAGE_QT_NETWORK
-	help
-	  Turns on support for Gui applications. If your board doesn't
-	  have video output, or you don't require Qt GUI, say n.
-
-if BR2_PACKAGE_QT_GUI_MODULE
-
-if BR2_PACKAGE_QT_EMBEDDED
-
-menu "Pixel depths"
-comment "Deselecting each option leads to Qt's default (8,16,32)"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_1
-	bool "1 bpp, black/white"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_4
-	bool "4 bpp, grayscale"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_8
-	bool "8 bpp, paletted"
-	default y
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_12
-	bool "12 bpp, rgb 4-4-4"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_15
-	bool "15 bpp, rgb 5-5-5"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_16
-	bool "16 bpp, rgb 5-6-5"
-	default y
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_18
-	bool "18 bpp, rgb 6-6-6"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_24
-	bool "24 bpp, rgb 8-8-8"
-
-config BR2_PACKAGE_QT_PIXEL_DEPTH_32
-	bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"
-	default y
-
-endmenu
-
-menu "Fonts"
-
-config BR2_PACKAGE_QT_FONT_TRUETYPE
-	bool "dejavu/vera"
-	default y
-	depends on BR2_PACKAGE_QT_QTFREETYPE || BR2_PACKAGE_QT_SYSTEMFREETYPE
-
-comment "dejavu/vera fonts need freetype support"
-	depends on !BR2_PACKAGE_QT_QTFREETYPE && !BR2_PACKAGE_QT_SYSTEMFREETYPE
-
-config BR2_PACKAGE_QT_FONT_MICRO
-	bool "micro"
-	default y
-
-config BR2_PACKAGE_QT_FONT_FIXED
-	bool "fixed"
-	default y
-
-config BR2_PACKAGE_QT_FONT_HELVETICA
-	bool "helvetica"
-	default y
-
-config BR2_PACKAGE_QT_FONT_JAPANESE
-	bool "japanese"
-
-config BR2_PACKAGE_QT_FONT_UNIFONT
-	bool "unicode"
-
-endmenu
-
-endif # BR2_PACKAGE_QT_EMBEDDED
-
-choice
-	prompt "freetype2 support"
-	default BR2_PACKAGE_QT_NOFREETYPE
-	help
-	  Select freetype2 support.
-
-config BR2_PACKAGE_QT_NOFREETYPE
-	bool "no freetype2 support"
-	depends on BR2_PACKAGE_QT_EMBEDDED
-	help
-	  Do not compile in Freetype2 support.
-
-comment "Qt freetype2 needs Qt embedded"
-	depends on BR2_PACKAGE_QT_X11
-
-config BR2_PACKAGE_QT_QTFREETYPE
-	bool "Qt freetype2"
-	depends on BR2_PACKAGE_QT_EMBEDDED
-	help
-	  Use the libfreetype bundled with Qt.
-
-config BR2_PACKAGE_QT_SYSTEMFREETYPE
-	bool "System freetype2"
-	select BR2_PACKAGE_FREETYPE
-	help
-	  Use shared libfreetype from the target system.
-	  See http://www.freetype.org/
-endchoice
-
-config BR2_PACKAGE_QT_GIF
-	bool "Enable GIF support"
-	help
-	  This compiles and installs the plugin for GIF reading support.
-
-config BR2_PACKAGE_QT_LIBMNG
-	bool "Enable libmng support"
-	help
-	  This compiles and installs the plugin for MNG support.
-
-choice
-	prompt "JPEG support"
-	default BR2_PACKAGE_QT_NOJPEG
-	help
-	  Select libjpeg support.
-
-config BR2_PACKAGE_QT_NOJPEG
-	bool "No jpeg support"
-	help
-	  Disable JPEG support
-
-config BR2_PACKAGE_QT_SYSTEMJPEG
-	bool "System libjpeg"
-	select BR2_PACKAGE_JPEG
-	help
-	  Link against system libjpeg
-
-config BR2_PACKAGE_QT_QTJPEG
-	bool "Use Qt bundled libjpeg"
-	help
-	  Link against libjpeg provided with Qt
-endchoice
-
-choice
-	prompt "PNG support"
-	default BR2_PACKAGE_QT_NOPNG
-	help
-	  Select which library to use if PNG support should be enabled.
-
-config BR2_PACKAGE_QT_NOPNG
-	bool "No PNG support"
-
-config BR2_PACKAGE_QT_SYSTEMPNG
-	bool "System libpng"
-	select BR2_PACKAGE_LIBPNG
-
-config BR2_PACKAGE_QT_QTPNG
-	bool "Use Qt bundled libpng"
-endchoice
-
-choice
-	prompt "TIFF support"
-	default BR2_PACKAGE_QT_NOTIFF
-	help
-	  Select which library to use if TIFF support should be enabled.
-
-config BR2_PACKAGE_QT_NOTIFF
-	bool "No TIFF support"
-
-config BR2_PACKAGE_QT_SYSTEMTIFF
-	bool "System libtiff"
-	select BR2_PACKAGE_TIFF
-
-config BR2_PACKAGE_QT_QTTIFF
-	bool "Use Qt bundled libtiff"
-endchoice
-
-config BR2_PACKAGE_QT_ACCESSIBILITY
-	bool "Enable accessibility support"
-	help
-	  This enables and compiles the accessibility support.
-
-endif # BR2_PACKAGE_QT_GUI_MODULE
-
-choice
-	prompt "zlib support"
-	default BR2_PACKAGE_QT_QTZLIB
-	help
-	  Select zlib support.
-
-config BR2_PACKAGE_QT_QTZLIB
-	bool "Qt zlib"
-	depends on !BR2_STATIC_LIBS
-	help
-	  Use the zlib bundled with Qt.
-
-comment "Qt zlib needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
-
-config BR2_PACKAGE_QT_SYSTEMZLIB
-	bool "System zlib"
-	select BR2_PACKAGE_ZLIB
-	help
-	  Use the shared zlib from the system.
-endchoice
-
-source "package/qt/Config.sql.in"
-if BR2_PACKAGE_QT_GUI_MODULE
-if BR2_PACKAGE_QT_EMBEDDED
-source "package/qt/Config.gfx.in"
-source "package/qt/Config.mouse.in"
-source "package/qt/Config.keyboard.in"
-endif
-
-config BR2_PACKAGE_QT_PHONON
-	bool "Phonon Module"
-	default y
-	depends on BR2_PACKAGE_GSTREAMER
-	select BR2_PACKAGE_GST_PLUGINS_BASE
-	help
-	  Build the Phonon module. Support for different audio/video
-	  formats can be configured at the GStreamer package.
-	  If unsure, say n.
-
-comment "Phonon module needs gstreamer"
-	depends on !BR2_PACKAGE_GSTREAMER
-
-config BR2_PACKAGE_QT_PHONON_BACKEND
-	bool "Phonon Module Backend"
-	depends on BR2_PACKAGE_QT_PHONON
-	help
-	  Build the platform Phonon plugin.
-	  If unsure, say n.
-
-config BR2_PACKAGE_QT_OPENGL
-	bool "OpenGL support"
-	default y
-	depends on (BR2_PACKAGE_HAS_LIBGL && BR2_PACKAGE_QT_X11) || \
-		   (BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES)
-	help
-	  This option enables OpenGL support.
-
-if BR2_PACKAGE_QT_OPENGL
-
-choice
-	prompt "OpenGL API"
-	help
-	  Select OpenGL API.
-
-comment "Desktop OpenGL not available (needs Qt standard (X11))"
-	depends on !BR2_PACKAGE_QT_X11
-
-config BR2_PACKAGE_QT_OPENGL_GL_DESKTOP
-	bool "Desktop OpenGL"
-	depends on BR2_PACKAGE_HAS_LIBGL
-	depends on BR2_PACKAGE_QT_X11
-	help
-	  Use desktop OpenGL.
-
-config BR2_PACKAGE_QT_OPENGL_ES
-	bool "OpenGL ES v2.x support"
-	depends on BR2_PACKAGE_HAS_LIBGLES
-	depends on BR2_PACKAGE_HAS_LIBEGL
-	help
-	  Enable the OpenGL ES v2.x support.
-
-endchoice
-
-endif # BR2_PACKAGE_QT_OPENGL
-
-endif
-
-config BR2_PACKAGE_QT_DBUS
-	bool "DBus Module"
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
-	depends on BR2_USE_MMU # dbus
-	select BR2_PACKAGE_DBUS
-	help
-	  Build the Qt DBus module.
-
-comment "DBus Module needs a toolchain w/ threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
-
-config BR2_PACKAGE_QT_XML
-	bool "XML Module"
-	default y
-	help
-	  Build the XML module.
-
-config BR2_PACKAGE_QT_XMLPATTERNS
-	bool "XML Patterns Module"
-	depends on BR2_PACKAGE_QT_XML
-	help
-	  Build QtXmlPatterns module.
-	  If unsure, say n
-
-config BR2_PACKAGE_QT_MULTIMEDIA
-	bool "Multimedia Module"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  Build QtMultimedia module.
-
-config BR2_PACKAGE_QT_AUDIO_BACKEND
-	bool "QtMultimedia Audio backend"
-	depends on BR2_PACKAGE_QT_MULTIMEDIA
-	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
-	select BR2_PACKAGE_ALSA_LIB
-	help
-	  Build the ALSA audio backend into QtMultimedia
-
-config BR2_PACKAGE_QT_SVG
-	bool "SVG Module"
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  Build the SVG module.
-	  If unsure, say n
-
-config BR2_PACKAGE_QT_NETWORK
-	bool "Network Module"
-	default y
-	help
-	  Install the Network module.
-	  if unsure, say y
-
-config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-	bool
-	# see src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-	# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
-	default y if BR2_arc || BR2_arm || BR2_armeb || BR2_i386 || BR2_microblazeel || \
-		BR2_microblazebe || BR2_mips || BR2_mipsel || \
-		(BR2_mips64 || BR2_mips64el) && !BR2_MIPS_NABI32 || BR2_powerpc || \
-		BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64 || \
-		BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-
-config BR2_PACKAGE_QT_WEBKIT
-	bool "WebKit Module"
-	depends on BR2_PACKAGE_QT_SCRIPT
-	depends on BR2_PACKAGE_QT_SHARED
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	depends on BR2_PACKAGE_QT_NETWORK
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # needs pthread_getattr_np()
-	depends on BR2_PACKAGE_GSTREAMER
-	select BR2_PACKAGE_GST_PLUGINS_BASE
-	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
-	help
-	  Build the WebKit module.
-	  If unsure, say n.
-
-comment "WebKit needs a toolchain w/ dynamic library, NPTL"
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIB
-
-comment "WebKit needs QtShared/Script/Gui/Network and Gstreamer 0.10"
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL && !BR2_STATIC_LIB
-	depends on !BR2_PACKAGE_QT_SCRIPT     || !BR2_PACKAGE_QT_SHARED   \
-		|| !BR2_PACKAGE_QT_GUI_MODULE || !BR2_PACKAGE_QT_NETWORK  \
-		|| !BR2_PACKAGE_GSTREAMER
-
-config BR2_PACKAGE_QT_STL
-	bool "STL support"
-	help
-	  Compile STL support.
-	  If unsure, say n.
-
-config BR2_PACKAGE_QT_OPENSSL
-	bool "Enable OpenSSL support"
-	depends on BR2_PACKAGE_QT_NETWORK
-	select BR2_PACKAGE_OPENSSL
-	help
-	  Enable support for the OpenSSL encryption library. If you use
-	  QSslSocket say y here, otherwise, say no to save space on the
-	  target.
-	  If unsure, say n.
-
-config BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
-	bool
-	# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
-	default y if BR2_arc || BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
-		BR2_microblazeel || BR2_microblazebe || BR2_mips || BR2_mipsel || \
-		BR2_mips64 || BR2_mips64el || BR2_nios2 || BR2_powerpc || \
-		BR2_powerpc64 || BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \
-		BR2_sh4a || BR2_sh4aeb || BR2_x86_64
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-
-config BR2_PACKAGE_QT_SCRIPT
-	bool "Script Module"
-	default y
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # needs pthread_getattr_np()
-	help
-	  Build the Qt Script module.
-	  if unsure, say y.
-
-comment "Script Module needs a toolchain with NPTL"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
-
-config BR2_PACKAGE_QT_SCRIPTTOOLS
-	bool "Script Tools Module"
-	depends on BR2_PACKAGE_QT_SCRIPT
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	help
-	  Build the Qt Script Tools module.
-	  if unsure, say n.
-
-config BR2_PACKAGE_QT_DECLARATIVE
-	bool "Declarative module"
-	depends on BR2_PACKAGE_QT_SCRIPT
-	depends on BR2_PACKAGE_QT_GUI_MODULE
-	depends on BR2_PACKAGE_QT_SQL_MODULE
-	help
-	  Build the Qt Declarative Module for qml support
-	  if unsure, say n.
-
-config BR2_PACKAGE_QT_TEST
-	bool "Test Module"
-	help
-	  Install the Test module.
-
-endif # BR2_PACKAGE_QT
diff --git a/package/qt/Config.keyboard.in b/package/qt/Config.keyboard.in
deleted file mode 100644
index b0425471ed..0000000000
--- a/package/qt/Config.keyboard.in
+++ /dev/null
@@ -1,12 +0,0 @@
-menu "Keyboard drivers"
-
-config BR2_PACKAGE_QT_KEYBOARD_TTY
-	bool "tty"
-
-config BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT
-	bool "linux input"
-
-config BR2_PACKAGE_QT_KEYBOARD_QVFB
-	bool "qvfb"
-
-endmenu
diff --git a/package/qt/Config.mouse.in b/package/qt/Config.mouse.in
deleted file mode 100644
index 1062facb6a..0000000000
--- a/package/qt/Config.mouse.in
+++ /dev/null
@@ -1,26 +0,0 @@
-menu "Mouse drivers"
-
-config BR2_PACKAGE_QT_MOUSE_PC
-	bool "pc"
-
-config BR2_PACKAGE_QT_MOUSE_LINUXTP
-	bool "linuxtp"
-
-config BR2_PACKAGE_QT_MOUSE_LINUXINPUT
-	bool "linux input"
-
-config BR2_PACKAGE_QT_MOUSE_TSLIB
-	bool "tslib"
-	select BR2_PACKAGE_TSLIB
-
-config BR2_PACKAGE_QT_MOUSE_QVFB
-	bool "qvfb"
-
-comment "Mouse Options"
-
-config BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR
-	bool "Hide the mouse cursor"
-	help
-	  Do not show the mouse cursor in QWS.
-
-endmenu
diff --git a/package/qt/Config.sql.in b/package/qt/Config.sql.in
deleted file mode 100644
index 71a198242f..0000000000
--- a/package/qt/Config.sql.in
+++ /dev/null
@@ -1,64 +0,0 @@
-menuconfig BR2_PACKAGE_QT_SQL_MODULE
-	bool "SQL Module"
-	help
-	  Compile Qt SQL Module
-
-if BR2_PACKAGE_QT_SQL_MODULE
-config BR2_PACKAGE_QT_MYSQL
-	bool "MySQL Driver"
-	depends on BR2_USE_MMU # mysql
-	select BR2_PACKAGE_MYSQL
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
-	help
-	  Build MySQL driver
-	  If unsure, say n.
-
-config BR2_PACKAGE_QT_ODBC
-	bool "ODBC Driver"
-	depends on !BR2_STATIC_LIBS # unixodbc
-	select BR2_PACKAGE_UNIXODBC
-	help
-	  Build ODBC driver
-	  If unsure, say n.
-
-comment "ODBC driver needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
-
-config BR2_PACKAGE_QT_PSQL
-	bool "PostgreSQL Driver"
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_POSTGRESQL
-	help
-	  Build PostgreSQL driver
-	  If unsure, say n.
-
-comment "PostgreSQL driver needs a toolchain w/ wchar, dynamic library"
-	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
-
-choice
-	prompt "SQLite 3 support"
-	default BR2_PACKAGE_QT_SQLITE_NONE
-	help
-	  Select SQLite support.
-
-config BR2_PACKAGE_QT_SQLITE_NONE
-	bool "No sqlite support"
-	help
-	  Do not compile any kind of SQLite support.
-
-config BR2_PACKAGE_QT_SQLITE_QT
-	bool "Qt SQLite"
-	help
-	  Use Qt bundled SQLite support.
-
-config BR2_PACKAGE_QT_SQLITE_SYSTEM
-	bool "System SQLite"
-	select BR2_PACKAGE_SQLITE
-	help
-	  Use system SQLite.
-
-endchoice
-
-endif
diff --git a/package/qt/powervr.ini b/package/qt/powervr.ini
deleted file mode 100644
index 57863ebc44..0000000000
--- a/package/qt/powervr.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[default]
-WindowSystem=libpvrQWSWSEGL.so.1
diff --git a/package/qt/qt.hash b/package/qt/qt.hash
deleted file mode 100644
index 301010cae1..0000000000
--- a/package/qt/qt.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# md5 http://download.qt.io/official_releases/qt/4.8/4.8.7/md5sums-4.8.7, sha256 locally computed:
-md5    d990ee66bf7ab0c785589776f35ba6ad                                 qt-everywhere-opensource-src-4.8.7.tar.gz
-sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 qt-everywhere-opensource-src-4.8.7.tar.gz
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
deleted file mode 100644
index 23cb94c11f..0000000000
--- a/package/qt/qt.mk
+++ /dev/null
@@ -1,725 +0,0 @@
-################################################################################
-#
-# qt
-#
-################################################################################
-
-QT_VERSION_MAJOR = 4.8
-QT_VERSION = $(QT_VERSION_MAJOR).7
-QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
-QT_SITE = http://download.qt.io/archive/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
-QT_DEPENDENCIES = host-pkgconf
-QT_INSTALL_STAGING = YES
-
-QT_LICENSE := LGPL-2.1 with exceptions or GPL-3.0
-QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
-
-# Opensource licenses are the only one we catter about
-QT_CONFIGURE_OPTS += -opensource -confirm-license
-
-QT_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE))
-
-ifneq ($(QT_CONFIG_FILE),)
-QT_CONFIGURE_OPTS += -qconfig buildroot
-endif
-
-QT_CFLAGS = $(TARGET_CFLAGS)
-QT_CXXFLAGS = $(TARGET_CXXFLAGS)
-QT_LDFLAGS = $(TARGET_LDFLAGS)
-
-# Qt WebKit build fails when gcc-6 is used for build, because
-# 'std::auto_ptr' is deprecated starting from gcc 6.x. So, we have to
-# use an older c++ standard to prevent build failure
-QT_CXXFLAGS += -std=gnu++98
-
-# gcc bug internal compiler error: in validate_condition_mode, at
-# config/rs6000/rs6000.c:180744. Bug is fixed since gcc 7.
-# Workaround is to set -mno-isel, see
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60818 and
-# https://gcc.gnu.org/ml/gcc-patches/2016-02/msg01036.html
-ifeq ($(BR2_powerpc_8540)$(BR2_powerpc_8548)$(BR2_powerpc_e500mc)$(BR2_powerpc_e5500):$(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y:)
-QT_CXXFLAGS += -mno-isel
-endif
-
-# Qt has some assembly function that are not present in thumb1 mode:
-# Error: selected processor does not support Thumb mode `swp r3,r7,[r4]'
-# so, we desactivate thumb mode
-ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
-QT_CFLAGS += -marm
-QT_CXXFLAGS += -marm
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
-QT_CONFIGURE_OPTS += -qt3support
-else
-QT_CONFIGURE_OPTS += -no-qt3support
-endif
-
-ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-QT_CONFIGURE_OPTS += -demosdir $(TARGET_DIR)/usr/share/qt/demos
-else
-QT_CONFIGURE_OPTS += -nomake demos
-endif
-ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples
-else
-QT_CONFIGURE_OPTS += -nomake examples
-endif
-
-# ensure glib is built first if enabled for Qt's glib support
-ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-QT_CONFIGURE_OPTS += -glib
-QT_DEPENDENCIES += libglib2
-else
-QT_CONFIGURE_OPTS += -no-glib
-endif
-
-### Pixel depths
-QT_PIXEL_DEPTHS = # empty
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)
-QT_PIXEL_DEPTHS += 1
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_4),y)
-QT_PIXEL_DEPTHS += 4
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_8),y)
-QT_PIXEL_DEPTHS += 8
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_12),y)
-QT_PIXEL_DEPTHS += 12
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_15),y)
-QT_PIXEL_DEPTHS += 15
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_16),y)
-QT_PIXEL_DEPTHS += 16
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_18),y)
-QT_PIXEL_DEPTHS += 18
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_24),y)
-QT_PIXEL_DEPTHS += 24
-endif
-ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_32),y)
-QT_PIXEL_DEPTHS += 32
-endif
-ifneq ($(QT_PIXEL_DEPTHS),)
-QT_CONFIGURE_OPTS += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS)))
-endif
-
-### Display drivers
-ifeq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y)
-QT_CONFIGURE_OPTS += -qt-gfx-linuxfb
-else
-QT_CONFIGURE_OPTS += -no-gfx-linuxfb
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y)
-QT_CONFIGURE_OPTS += -qt-gfx-transformed
-else
-QT_CONFIGURE_OPTS += -no-gfx-transformed
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_QVFB),y)
-QT_CONFIGURE_OPTS += -qt-gfx-qvfb
-else
-QT_CONFIGURE_OPTS += -no-gfx-qvfb
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_VNC),y)
-QT_CONFIGURE_OPTS += -qt-gfx-vnc
-else
-QT_CONFIGURE_OPTS += -no-gfx-vnc
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_MULTISCREEN),y)
-QT_CONFIGURE_OPTS += -qt-gfx-multiscreen
-else
-QT_CONFIGURE_OPTS += -no-gfx-multiscreen
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_DIRECTFB),y)
-QT_CONFIGURE_OPTS += -qt-gfx-directfb
-QT_DEPENDENCIES += directfb
-else
-QT_CONFIGURE_OPTS += -no-gfx-directfb
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
-QT_CONFIGURE_OPTS += \
-	-plugin-gfx-powervr -D QT_NO_QWS_CURSOR -D QT_QWS_CLIENTBLIT
-QT_DEPENDENCIES += powervr
-endif
-
-### Mouse drivers
-ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
-QT_CONFIGURE_OPTS += -qt-mouse-pc
-else
-QT_CONFIGURE_OPTS += -no-mouse-pc
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y)
-QT_CONFIGURE_OPTS += -qt-mouse-linuxtp
-else
-QT_CONFIGURE_OPTS += -no-mouse-linuxtp
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXINPUT),y)
-QT_CONFIGURE_OPTS += -qt-mouse-linuxinput
-else
-QT_CONFIGURE_OPTS += -no-mouse-linuxinput
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
-QT_CONFIGURE_OPTS += -qt-mouse-tslib
-QT_DEPENDENCIES += tslib
-else
-QT_CONFIGURE_OPTS += -no-mouse-tslib
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_QVFB),y)
-QT_CONFIGURE_OPTS += -qt-mouse-qvfb
-else
-QT_CONFIGURE_OPTS += -no-mouse-qvfb
-endif
-ifeq ($(BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR),y)
-QT_CONFIGURE_OPTS += -D QT_NO_QWS_CURSOR
-endif
-
-### Keyboard drivers
-ifeq ($(BR2_PACKAGE_QT_KEYBOARD_TTY),y)
-QT_CONFIGURE_OPTS += -qt-kbd-tty
-else
-QT_CONFIGURE_OPTS += -no-kbd-tty
-endif
-ifeq ($(BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT),y)
-QT_CONFIGURE_OPTS += -qt-kbd-linuxinput
-else
-QT_CONFIGURE_OPTS += -no-kbd-linuxinput
-endif
-ifeq ($(BR2_PACKAGE_QT_KEYBOARD_QVFB),y)
-QT_CONFIGURE_OPTS += -qt-kbd-qvfb
-else
-QT_CONFIGURE_OPTS += -no-kbd-qvfb
-endif
-
-ifeq ($(BR2_PACKAGE_QT_DEBUG),y)
-QT_CONFIGURE_OPTS += -debug
-else
-QT_CONFIGURE_OPTS += -release
-endif
-
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-QT_CONFIGURE_OPTS += -shared
-else
-QT_CONFIGURE_OPTS += -static
-endif
-
-ifeq ($(BR2_STATIC_LIBS),y)
-QT_CONFIGURE_OPTS += -D QT_NO_DYNAMIC_LIBRARY
-endif
-
-ifeq ($(BR2_ENDIAN),"LITTLE")
-QT_CONFIGURE_OPTS += -little-endian
-else
-QT_CONFIGURE_OPTS += -big-endian
-endif
-
-ifeq ($(BR2_arm)$(BR2_armeb),y)
-QT_EMB_PLATFORM = arm
-else ifeq ($(BR2_i386),y)
-QT_EMB_PLATFORM = x86
-else ifeq ($(BR2_x86_64),y)
-QT_EMB_PLATFORM = x86_64
-else ifeq ($(BR2_mips)$(BR2_mipsel),y)
-QT_EMB_PLATFORM = mips
-else ifeq ($(BR2_powerpc),y)
-QT_EMB_PLATFORM = powerpc
-else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y)
-QT_EMB_PLATFORM = sh
-else
-QT_EMB_PLATFORM = generic
-endif
-
-ifeq ($(BR2_PACKAGE_QT_X11),y)
-QT_DEPENDENCIES += fontconfig xlib_libXi xlib_libX11 xlib_libXrender \
-	xlib_libXcursor xlib_libXrandr xlib_libXext xlib_libXv
-# Using pkg-config avoids us some logic to redefine and sed again mkspecs files
-# to add X11 include path and link options
-QT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags x11`
-QT_CXXFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags x11`
-QT_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs x11 xext`
-QT_CONFIGURE_OPTS += -arch $(QT_EMB_PLATFORM) \
-		-xplatform qws/linux-$(QT_EMB_PLATFORM)-g++ -x11 -no-gtkstyle -no-sm \
-		-no-openvg
-else # if BR2_PACKAGE_QT_EMBEDDED
-QT_CONFIGURE_OPTS += -embedded $(QT_EMB_PLATFORM)
-endif
-
-ifneq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-QT_CONFIGURE_OPTS += -no-gui
-endif
-
-ifneq ($(BR2_PACKAGE_QT_GIF),y)
-QT_CONFIGURE_OPTS += -no-gif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_LIBMNG),y)
-QT_CONFIGURE_OPTS += -qt-libmng
-else
-QT_CONFIGURE_OPTS += -no-libmng
-endif
-
-ifeq ($(BR2_PACKAGE_QT_ACCESSIBILITY),y)
-QT_CONFIGURE_OPTS += -accessibility
-else
-QT_CONFIGURE_OPTS += -no-accessibility
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QTZLIB),y)
-QT_CONFIGURE_OPTS += -qt-zlib
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y)
-QT_CONFIGURE_OPTS += -system-zlib
-QT_DEPENDENCIES += zlib
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QTJPEG),y)
-QT_CONFIGURE_OPTS += -qt-libjpeg
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y)
-QT_CONFIGURE_OPTS += -system-libjpeg
-QT_DEPENDENCIES += jpeg
-else
-QT_CONFIGURE_OPTS += -no-libjpeg
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QTPNG),y)
-QT_CONFIGURE_OPTS += -qt-libpng
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y)
-QT_CONFIGURE_OPTS += -system-libpng
-QT_DEPENDENCIES += libpng
-else
-QT_CONFIGURE_OPTS += -no-libpng
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_QTTIFF),y)
-QT_CONFIGURE_OPTS += -qt-libtiff
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y)
-QT_CONFIGURE_OPTS += -system-libtiff
-QT_DEPENDENCIES += tiff
-else
-QT_CONFIGURE_OPTS += -no-libtiff
-endif
-endif
-
-QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
-	   $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \
-	   $(if $(BR2_PACKAGE_QT_FONT_FIXED),fixed) \
-	   $(if $(BR2_PACKAGE_QT_FONT_HELVETICA),helvetica) \
-	   $(if $(BR2_PACKAGE_QT_FONT_JAPANESE),japanese) \
-	   $(if $(BR2_PACKAGE_QT_FONT_UNIFONT),unifont)))
-
-ifeq ($(BR2_PACKAGE_QT_QTFREETYPE),y)
-QT_CONFIGURE_OPTS += -qt-freetype
-else
-ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
-QT_CONFIGURE_OPTS += -system-freetype
-QT_CONFIGURE_OPTS += -I $(STAGING_DIR)/usr/include/freetype2/
-QT_DEPENDENCIES += freetype
-else
-QT_CONFIGURE_OPTS += -no-freetype
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-QT_DEPENDENCIES += dbus
-endif
-
-ifeq ($(BR2_PACKAGE_QT_OPENSSL),y)
-QT_CONFIGURE_OPTS += -openssl
-QT_DEPENDENCIES += openssl
-else
-QT_CONFIGURE_OPTS += -no-openssl
-endif
-
-ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
-QT_CONFIGURE_OPTS += -opengl es2 -egl
-QT_DEPENDENCIES += libgles libegl
-QT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
-QT_CXXFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
-QT_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs egl`
-else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y)
-QT_CONFIGURE_OPTS += -opengl desktop
-QT_DEPENDENCIES += libgl
-else
-QT_CONFIGURE_OPTS += -no-opengl
-endif
-
-# Qt SQL Drivers
-ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
-ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
-QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
-QT_DEPENDENCIES += mysql
-endif
-ifeq ($(BR2_PACKAGE_QT_ODBC),y)
-QT_CONFIGURE_OPTS += -qt-sql-odbc
-QT_DEPENDENCIES += unixodbc
-endif
-ifeq ($(BR2_PACKAGE_QT_PSQL),y)
-QT_CONFIGURE_OPTS += -qt-sql-psql -psql_config $(STAGING_DIR)/usr/bin/pg_config
-QT_DEPENDENCIES += postgresql
-endif
-ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
-QT_CONFIGURE_OPTS += -qt-sql-sqlite
-else
-ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
-QT_CONFIGURE_OPTS += -system-sqlite
-QT_DEPENDENCIES += sqlite
-else
-QT_CONFIGURE_OPTS += -no-sql-sqlite
-endif
-endif
-ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
-QT_CONFIGURE_OPTS += -qt-sql-sqlite2
-endif
-else
-# By default, no SQL driver is turned on by configure.
-# but it seems sqlite isn't disabled despite what says
-# configure --help
-QT_CONFIGURE_OPTS += -no-sql-sqlite
-endif
-
-ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_CONFIGURE_OPTS += -xmlpatterns -exceptions
-else
-QT_CONFIGURE_OPTS += -no-xmlpatterns
-endif
-
-ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
-QT_CONFIGURE_OPTS += -multimedia
-else
-QT_CONFIGURE_OPTS += -no-multimedia
-endif
-
-ifeq ($(BR2_PACKAGE_QT_AUDIO_BACKEND),y)
-QT_CONFIGURE_OPTS += -audio-backend
-QT_DEPENDENCIES += alsa-lib
-else
-QT_CONFIGURE_OPTS += -no-audio-backend
-endif
-
-ifeq ($(BR2_PACKAGE_QT_PHONON),y)
-QT_CONFIGURE_OPTS += -phonon
-QT_DEPENDENCIES += gstreamer gst-plugins-base
-else
-QT_CONFIGURE_OPTS += -no-phonon
-endif
-
-ifeq ($(BR2_PACKAGE_QT_PHONON_BACKEND),y)
-QT_CONFIGURE_OPTS += -phonon-backend
-else
-QT_CONFIGURE_OPTS += -no-phonon-backend
-endif
-
-ifeq ($(BR2_PACKAGE_QT_SVG),y)
-QT_CONFIGURE_OPTS += -svg
-else
-QT_CONFIGURE_OPTS += -no-svg
-endif
-
-ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
-QT_CONFIGURE_OPTS += -webkit
-QT_DEPENDENCIES += gstreamer gst-plugins-base
-else
-QT_CONFIGURE_OPTS += -no-webkit
-endif
-
-ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
-QT_CONFIGURE_OPTS += -script
-else
-QT_CONFIGURE_OPTS += -no-script
-endif
-
-ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
-QT_CONFIGURE_OPTS += -scripttools
-else
-QT_CONFIGURE_OPTS += -no-scripttools
-endif
-
-ifeq ($(BR2_PACKAGE_QT_STL),y)
-QT_CONFIGURE_OPTS += -stl
-else
-QT_CONFIGURE_OPTS += -no-stl
-endif
-
-ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
-QT_CONFIGURE_OPTS += -declarative
-else
-QT_CONFIGURE_OPTS += -no-declarative
-endif
-
-# -no-pch is needed to workaround the issue described at
-# http://comments.gmane.org/gmane.comp.lib.qt.devel/5933.
-# In addition, ccache and precompiled headers don't play well together
-QT_CONFIGURE_OPTS += -no-pch
-
-# x86x86fix
-# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
-# host. It's unclear if this would happen on other hosts.
-ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
-ifneq ($(findstring x86,$(QT_EMB_PLATFORM)),)
-QT_CONFIGURE_OPTS += -platform linux-g++
-endif
-endif
-# End of workaround.
-
-# Variable for other Qt applications to use
-QT_QMAKE = $(HOST_DIR)/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
-
-################################################################################
-# QT_QMAKE_SET -- helper macro to set <variable> = <value> in
-# the qmake.conf file. Will remove existing variable declaration if
-# available.
-#
-# Argument 1 is the variable name
-# Argument 2 is the value to set variable to
-# Argument 3 is the base source directory of Qt
-#
-# E.G. use like this:
-# $(call QT_QMAKE_SET,variable,value,directory)
-################################################################################
-define QT_QMAKE_SET
-	$(SED) '/$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) "/include.*qws.conf/a$(1) = $(2)" $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
-endef
-
-ifneq ($(QT_CONFIG_FILE),)
-define QT_CONFIGURE_CONFIG_FILE
-	cp $(QT_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h
-endef
-endif
-
-define QT_CONFIGURE_CMDS
-	-[ -f $(@D)/Makefile ] && $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) confclean
-	$(QT_CONFIGURE_IPV6)
-	$(QT_CONFIGURE_CONFIG_FILE)
-	# Fix compiler path
-	$(call QT_QMAKE_SET,QMAKE_CC,$(TARGET_CC),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_CXX,$(TARGET_CXX),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_LINK,$(TARGET_CXX),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_LINK_SHLIB,$(TARGET_CXX),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_AR,$(TARGET_AR) cqs,$(@D))
-	$(call QT_QMAKE_SET,QMAKE_OBJCOPY,$(TARGET_OBJCOPY),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_RANLIB,$(TARGET_RANLIB),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D))
-	$(call QT_QMAKE_SET,QMAKE_LFLAGS,$(QT_LDFLAGS),$(@D))
-	$(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/bin/pkg-config,$(@D))
-# Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
-# instead of the host then. So set PKG_CONFIG* manually.
-	(cd $(@D); \
-		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
-		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
-		$(TARGET_MAKE_ENV) \
-		MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \
-		$(if $(VERBOSE),-verbose,-silent) \
-		-force-pkg-config \
-		$(QT_CONFIGURE_OPTS) \
-		-no-xinerama \
-		-no-cups \
-		-no-nis \
-		-no-separate-debug-info \
-		-prefix /usr \
-		-plugindir /usr/lib/qt/plugins \
-		-importdir /usr/lib/qt/imports \
-		-translationdir /usr/share/qt/translations \
-		-hostprefix $(STAGING_DIR) \
-		-fast \
-		-no-rpath \
-	)
-endef
-
-define QT_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-# Build the list of libraries and plugins to install to the target
-
-QT_INSTALL_LIBS += QtCore
-QT_HOST_PROGRAMS += moc rcc qmake lrelease
-
-ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-QT_INSTALL_LIBS += QtGui
-QT_HOST_PROGRAMS += uic
-endif
-ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
-QT_INSTALL_LIBS += QtSql
-endif
-ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
-QT_INSTALL_LIBS += QtMultimedia
-endif
-ifeq ($(BR2_PACKAGE_QT_PHONON),y)
-QT_INSTALL_LIBS += phonon
-endif
-ifeq ($(BR2_PACKAGE_QT_SVG),y)
-QT_INSTALL_LIBS += QtSvg
-endif
-ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
-QT_INSTALL_LIBS += QtNetwork
-endif
-ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
-QT_INSTALL_LIBS += QtWebKit
-endif
-ifeq ($(BR2_PACKAGE_QT_XML),y)
-QT_INSTALL_LIBS += QtXml
-endif
-ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-QT_INSTALL_LIBS += QtDBus
-endif
-ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_INSTALL_LIBS += QtXmlPatterns
-endif
-ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
-QT_INSTALL_LIBS += QtScript
-endif
-ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
-QT_INSTALL_LIBS += QtScriptTools
-endif
-ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
-QT_INSTALL_LIBS += QtDeclarative
-endif
-ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
-QT_INSTALL_LIBS += Qt3Support
-endif
-ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
-QT_INSTALL_LIBS += QtOpenGL
-endif
-ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
-QT_INSTALL_LIBS += pvrQWSWSEGL
-endif
-ifeq ($(BR2_PACKAGE_QT_TEST),y)
-QT_INSTALL_LIBS += QtTest
-endif
-
-QT_CONF_FILE = $(HOST_DIR)/bin/qt.conf
-
-# Since host programs and spec files have been moved to $(HOST_DIR),
-# we need to tell qmake the new location of the various elements,
-# through a qt.conf file.
-define QT_INSTALL_QT_CONF
-	mkdir -p $(dir $(QT_CONF_FILE))
-	echo "[Paths]"                             > $(QT_CONF_FILE)
-	echo "Prefix=$(HOST_DIR)"                 >> $(QT_CONF_FILE)
-	echo "Headers=$(STAGING_DIR)/usr/include" >> $(QT_CONF_FILE)
-	echo "Libraries=$(STAGING_DIR)/usr/lib"   >> $(QT_CONF_FILE)
-	echo "Data=$(HOST_DIR)"                   >> $(QT_CONF_FILE)
-	echo "Binaries=$(HOST_DIR)/bin"           >> $(QT_CONF_FILE)
-endef
-
-# After running Qt normal installation process (which installs
-# everything in the STAGING_DIR), we move host programs such as qmake,
-# rcc or uic to the HOST_DIR so that they are available at the usual
-# location. A qt.conf file is generated to make sure that all host
-# programs still find all files they need. The .pc files are tuned to
-# remove the sysroot path from them, since pkg-config already adds it
-# automatically.
-define QT_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-	mkdir -p $(HOST_DIR)/bin
-	mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/bin
-	ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/mkspecs
-	$(QT_INSTALL_QT_CONF)
-	for i in moc uic rcc lupdate lrelease ; do \
-		$(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/bin/$${i}," \
-			$(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc ; \
-	done
-	$(SED) "s,$(STAGING_DIR)/,,g" $(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc
-endef
-
-# Library installation
-ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-define QT_INSTALL_TARGET_LIBS
-	mkdir -p $(TARGET_DIR)/usr/lib
-	for lib in $(QT_INSTALL_LIBS); do \
-		cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib ; \
-	done
-endef
-endif
-
-# Plugin installation
-define QT_INSTALL_TARGET_PLUGINS
-	if [ -d $(STAGING_DIR)/usr/lib/qt/plugins/ ] ; then \
-		mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins ; \
-		cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins ; \
-	fi
-endef
-
-# Import installation
-define QT_INSTALL_TARGET_IMPORTS
-	if [ -d $(STAGING_DIR)/usr/lib/qt/imports/ ] ; then \
-		mkdir -p $(TARGET_DIR)/usr/lib/qt/imports ; \
-		cp -dpfr $(STAGING_DIR)/usr/lib/qt/imports/* $(TARGET_DIR)/usr/lib/qt/imports ; \
-	fi
-endef
-
-# Fonts installation
-ifeq ($(BR2_PACKAGE_QT_EMBEDDED),y)
-ifneq ($(QT_FONTS),)
-define QT_INSTALL_TARGET_FONTS
-	mkdir -p $(TARGET_DIR)/usr/lib/fonts
-	cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
-endef
-ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),)
-# as stated in the font source src/3rdparty/fonts/micro.bdf
-# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf
-QT_LICENSE := $(QT_LICENSE), Public Domain (Micro/Fixed font)
-endif
-ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),)
-QT_LICENSE := $(QT_LICENSE), Adobe Helvetica license (Helvetica/Japanese fonts)
-QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica
-endif
-ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y)
-QT_LICENSE := $(QT_LICENSE), Freeware (Unifont font)
-QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont
-endif
-endif # QT_FONTS
-
-ifeq ($(BR2_PACKAGE_QT_FONT_TRUETYPE),y)
-define QT_INSTALL_TARGET_FONTS_TTF
-	mkdir -p $(TARGET_DIR)/usr/lib/fonts
-	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
-endef
-QT_LICENSE := $(QT_LICENSE), Bitstream license (DejaVu/Vera TrueType fonts)
-QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \
-	src/3rdparty/fonts/README.DejaVu \
-	src/3rdparty/fonts/COPYRIGHT.Vera
-endif
-endif # BR2_PACKAGE_QT_EMBEDDED
-
-ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
-define QT_INSTALL_TARGET_POWERVR
-	# Note: this overwrites the default powervr.ini provided by the ti-gfx
-	# package.
-	$(INSTALL) -D -m 0644 package/qt/powervr.ini \
-		$(TARGET_DIR)/etc/powervr.ini
-endef
-endif
-
-ifeq ($(BR2_PACKAGE_QT_TRANSLATION_FILES),y)
-define QT_INSTALL_TARGET_TRANSLATIONS
-	if [ -d $(STAGING_DIR)/usr/share/qt/translations/ ] ; then \
-		mkdir -p $(TARGET_DIR)/usr/share/qt/translations ; \
-		cp -dpfr $(STAGING_DIR)/usr/share/qt/translations/* $(TARGET_DIR)/usr/share/qt/translations ; \
-	fi
-endef
-endif
-
-define QT_INSTALL_TARGET_CMDS
-	$(QT_INSTALL_TARGET_LIBS)
-	$(QT_INSTALL_TARGET_PLUGINS)
-	$(QT_INSTALL_TARGET_IMPORTS)
-	$(QT_INSTALL_TARGET_FONTS)
-	$(QT_INSTALL_TARGET_FONTS_TTF)
-	$(QT_INSTALL_TARGET_POWERVR)
-	$(QT_INSTALL_TARGET_TRANSLATIONS)
-endef
-
-$(eval $(generic-package))
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 735824402e..a50b57a821 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -12,7 +12,6 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on !BR2_ARM_CPU_ARMV4
 
 comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
-	depends on !BR2_PACKAGE_QT
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 
 menuconfig BR2_PACKAGE_QT5
@@ -21,7 +20,6 @@ menuconfig BR2_PACKAGE_QT5
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS
-	depends on !BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT5BASE
 	help
 	  This option enables the Qt5 framework. Sub-options allow to
-- 
2.11.0

[Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option

[Gwenhael Goavec-Merou]

Peter, all.
I'm not really happy by removing QT support. It's true, current version use QT4
and python2.7 but github master uses QT5 and python3. Instead of removing this
option (with the need to re-add soon) it's maybe a better idea to use a more
recent hash (or backporting debian patch) to switch to QT5.
I don't know which version is better;

Gwen

 On Wed,  6 Feb 2019 15:10:43 +0100
Peter Korsgaard <peter@korsgaard.com> wrote:

> The gr-qtgui option uses python-pyqt/Qt4, which we are about to remove, so
> remove the option.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  Config.in.legacy             |  6 ++++++
>  package/gnuradio/Config.in   | 10 ----------
>  package/gnuradio/gnuradio.mk | 10 ++--------
>  3 files changed, 8 insertions(+), 18 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index be2f722b05..c84a9239a7 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,12 @@ endif
>  
>  comment "Legacy options removed in 2019.02"
>  
> +config BR2_PACKAGE_GNURADIO_QTGUI
> +	bool "gnuradio gr-qtgui option removed"
> +	select BR2_LEGACY
> +	help
> +	  The gr-qtgui option was removed.
> +
>  config BR2_PACKAGE_LUACRYPTO
>  	bool "luacrypto package removed"
>  	select BR2_LEGACY
> diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
> index 533a49c81e..3fdaea850e 100644
> --- a/package/gnuradio/Config.in
> +++ b/package/gnuradio/Config.in
> @@ -116,16 +116,6 @@ config BR2_PACKAGE_GNURADIO_PAGER
>  	help
>  	  FLEX pager decoder implementation blocks
>  
> -config BR2_PACKAGE_GNURADIO_QTGUI
> -	bool "gr-qtgui"
> -	depends on BR2_PACKAGE_PYTHON_PYQT
> -	depends on BR2_PACKAGE_QWT
> -	depends on BR2_PACKAGE_QT_STL
> -	select BR2_PACKAGE_GNURADIO_FFT
> -	select BR2_PACKAGE_GNURADIO_FILTER
> -	help
> -	  GNU Radio Qt scopes
> -
>  config BR2_PACKAGE_GNURADIO_TRELLIS
>  	bool "gr-trellis support"
>  	select BR2_PACKAGE_GNURADIO_DIGITAL
> diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
> index 564ad8b2a4..d6d07f6566 100644
> --- a/package/gnuradio/gnuradio.mk
> +++ b/package/gnuradio/gnuradio.mk
> @@ -25,7 +25,8 @@ endif
>  GNURADIO_CONF_OPTS = \
>  	-DENABLE_DEFAULT=OFF \
>  	-DENABLE_VOLK=ON \
> -	-DENABLE_GNURADIO_RUNTIME=ON
> +	-DENABLE_GNURADIO_RUNTIME=ON \
> +	-DENABLE_GR_QTGUI=OFF
>  
>  # For third-party blocks, the gnuradio libraries are mandatory at
>  # compile time.
> @@ -126,13 +127,6 @@ else
>  GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF
>  endif
>  
> -ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y)
> -GNURADIO_DEPENDENCIES += python-pyqt qwt
> -GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON
> -else
> -GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF
> -endif
> -
>  ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y)
>  GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON
>  else
> -- 
> 2.11.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option

[Thomas Petazzoni]

Hello,

On Wed, 6 Feb 2019 15:39:50 +0100
Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote:

> I'm not really happy by removing QT support. It's true, current version use QT4
> and python2.7 but github master uses QT5 and python3. Instead of removing this
> option (with the need to re-add soon) it's maybe a better idea to use a more
> recent hash (or backporting debian patch) to switch to QT5.
> I don't know which version is better;

We have marked Qt4 obsolete a year ago, it's no longer maintained, and
it doesn't build with OpenSSL 1.1, it's really time to remove it.

We will happily take a follow-up patch that re-enables Qt support in
gnuradio once the gnuradio package in Buildroot uses a sufficiently
recent version of it that has Qt5 support.

Would that work for you ?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option

[Arnout Vandecappelle]

On 06/02/2019 15:52, Thomas Petazzoni wrote:
> Hello,
> 
> On Wed, 6 Feb 2019 15:39:50 +0100
> Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote:
> 
>> I'm not really happy by removing QT support. It's true, current version use QT4
>> and python2.7 but github master uses QT5 and python3. Instead of removing this
>> option (with the need to re-add soon) it's maybe a better idea to use a more
>> recent hash (or backporting debian patch) to switch to QT5.
>> I don't know which version is better;
> 
> We have marked Qt4 obsolete a year ago, it's no longer maintained, and
> it doesn't build with OpenSSL 1.1, it's really time to remove it.
> 
> We will happily take a follow-up patch that re-enables Qt support in
> gnuradio once the gnuradio package in Buildroot uses a sufficiently
> recent version of it that has Qt5 support.

 Also note that the qt5 integration in gnuradio.mk will anyway need to be very
different from the current qt4 integration, so it's OK to remove it first and
add later.

 BTW, series applied to master, thanks.


 Regards,
 Arnout