Skip to contentSkip to conversation

package/gnuradio: remove qtgui option

PATCH New Peter Korsgaard 4 participants 19 messages Feb 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/16 package/gnuradio: remove qtgui option

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

---
 Config.in.legacy             |  6 ++++++
 package/gnuradio/Config.in   | 10 ----------
 package/gnuradio/gnuradio.mk | 10 ++--------
 3 files changed, 8 insertions(+), 18 deletions(-)
Config.in.legacy +6 -0
index be2f722b05..c84a9239a7 100644
@@ -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
package/gnuradio/Config.in +0 -10
index 533a49c81e..3fdaea850e 100644
@@ -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
package/gnuradio/gnuradio.mk +2 -8
index 564ad8b2a4..d6d07f6566 100644
@@ -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
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/16 package/python-pyqt: remove package

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 <[email protected]>
---
 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
Config.in.legacy +7 -0
index c84a9239a7..5a330cada9 100644
@@ -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
DEVELOPERS +0 -1
index 1f3cc6a888..7ba6377db6 100644
@@ -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/
 
package/Config.in +0 -1
index ebba7b4df2..9907221b68 100644
@@ -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"
package/python-pyqt/0001-configure-skip-qtdetail.patch deleted +0 -29
deleted file mode 100644
index 08e99d026c..0000000000
@@ -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 <[email protected]>
-Signed-off-by: Sergey Kostanbaev <[email protected]>
----
-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))
- 
package/python-pyqt/0002-configure-set-qws.patch deleted +0 -43

43 lines not on this page · raw message

package/python-pyqt/0003-sip-add_qws.patch deleted +0 -44

44 lines not on this page · raw message

package/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch deleted +0 -18
deleted file mode 100644
index c07bea777f..0000000000
@@ -1,18 +0,0 @@
-Hide QFont::cacheStatistics which isn't available in QWS
-
-Signed-off-by: Sergey Kostanbaev <[email protected]>
----
-
-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;
package/python-pyqt/0005-sip-fix_qws_handle.patch deleted +0 -24
deleted file mode 100644
index 80623d112a..0000000000
@@ -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 <[email protected]>
-Signed-off-by: Sergey Kostanbaev <[email protected]>
----
-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;
package/python-pyqt/Config.in deleted +0 -21
deleted file mode 100644
index 6934a4c4ab..0000000000
@@ -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
package/python-pyqt/python-pyqt.hash deleted +0 -5
deleted file mode 100644
index 1709b66ab8..0000000000
@@ -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
package/python-pyqt/python-pyqt.mk deleted +0 -113

113 lines not on this page · raw message

Signature · 1 line
2.11.0
#2 lore raw

PATCH 3/16 package/python-sip: remove qt4 support

In reply to 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.

---
 package/python-sip/Config.in     | 14 ++++++++------
 package/python-sip/python-sip.mk |  4 ----
 2 files changed, 8 insertions(+), 10 deletions(-)
package/python-sip/Config.in +8 -6
index 1f8961d0df..4ce4f89b2a 100644
@@ -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
package/python-sip/python-sip.mk +0 -4
index 76d7d04187..69019f5f19 100644
@@ -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
Signature · 1 line
2.11.0
#3 lore raw

PATCH 4/16 package/sdl: remove qtopia video driver option

In reply to Peter Korsgaard

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

---
 Config.in.legacy      | 6 ++++++
 package/sdl/Config.in | 4 ----
 package/sdl/sdl.mk    | 5 -----
 3 files changed, 6 insertions(+), 9 deletions(-)
Config.in.legacy +6 -0
index 5a330cada9..0eb69361cc 100644
@@ -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
package/sdl/Config.in +0 -4
index 65ac8a2469..9f1e34de5c 100644
@@ -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
package/sdl/sdl.mk +0 -5
index 0a6a7de139..d8b3733e4a 100644
@@ -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
Signature · 1 line
2.11.0
#4 lore raw

PATCH 5/16 package/amd-catalyst: remove control center option

In reply to Peter Korsgaard

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

---
 Config.in.legacy                     |  6 ++++++
 package/amd-catalyst/Config.in       | 16 ----------------
 package/amd-catalyst/amd-catalyst.mk | 10 ----------
 3 files changed, 6 insertions(+), 26 deletions(-)
Config.in.legacy +6 -0
index 0eb69361cc..dbd7450741 100644
@@ -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
package/amd-catalyst/Config.in +0 -16
index 85551ed803..1a5bf02953 100644
@@ -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"
package/amd-catalyst/amd-catalyst.mk +0 -10
index d864095c31..fe8aa850f0 100644
@@ -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
 
Signature · 1 line
2.11.0
#5 lore raw

PATCH 6/16 package/opencv: remove qt backend option

In reply to 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.

---
 Config.in.legacy         |  6 ++++++
 package/opencv/Config.in | 12 ------------
 package/opencv/opencv.mk |  8 +-------
 3 files changed, 7 insertions(+), 19 deletions(-)
Config.in.legacy +6 -0
index dbd7450741..cdf5f989b5 100644
@@ -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
package/opencv/Config.in +0 -12
index b7c8c41682..54094b29ca 100644
@@ -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
package/opencv/opencv.mk +1 -7
index d9813a041d..ccc2d820da 100644
@@ -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
Signature · 1 line
2.11.0
#6 lore raw

PATCH 7/16 package/opencv3: remove qt backend option

In reply to 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.

---
 Config.in.legacy           |  6 ++++++
 package/opencv3/Config.in  | 16 +---------------
 package/opencv3/opencv3.mk | 11 ++---------
 3 files changed, 9 insertions(+), 24 deletions(-)
Config.in.legacy +6 -0
index cdf5f989b5..67e3b0dc70 100644
@@ -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
package/opencv3/Config.in +1 -15
index 80a297a904..61405a7c64 100644
@@ -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
 
package/opencv3/opencv3.mk +2 -9
index 978f38c143..3a2594b584 100644
@@ -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)
Signature · 1 line
2.11.0
#7 lore raw

PATCH 8/16 package/poppler: remove qt option

In reply to Peter Korsgaard

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

---
 Config.in.legacy           | 6 ++++++
 package/poppler/Config.in  | 8 --------
 package/poppler/poppler.mk | 9 +--------
 3 files changed, 7 insertions(+), 16 deletions(-)
Config.in.legacy +6 -0
index 67e3b0dc70..c137006948 100644
@@ -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
package/poppler/Config.in +0 -8
index 9b03df8d27..4a553df721 100644
@@ -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
package/poppler/poppler.mk +1 -8
index bad61a6613..be1c0e4821 100644
@@ -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
Signature · 1 line
2.11.0
#8 lore raw

PATCH 9/16 package/pinentry: remove qt4 option

In reply to Peter Korsgaard

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

---
 Config.in.legacy             |  6 ++++++
 package/pinentry/Config.in   | 18 ------------------
 package/pinentry/pinentry.mk | 11 +++--------
 3 files changed, 9 insertions(+), 26 deletions(-)
Config.in.legacy +6 -0
index c137006948..64f5d58bd7 100644
@@ -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
package/pinentry/Config.in +0 -18
index 5f2cb58fbb..22bc2bb43d 100644
@@ -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
 
package/pinentry/pinentry.mk +3 -8
index d0179728bd..ce82f1090a 100644
@@ -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
Signature · 1 line
2.11.0
#9 lore raw

PATCH 10/16 package/qtuio: remove package

In reply to Peter Korsgaard

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

CC Stephan Hoffmann <[email protected]>
---
 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
Config.in.legacy +6 -0
index 64f5d58bd7..9c38abdc41 100644
@@ -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
DEVELOPERS +0 -1
index 7ba6377db6..070e40fdeb 100644
@@ -2014,7 +2014,6 @@ F:	package/cache-calibrator/
 F:	package/gtest/
 F:	package/mtdev/
 F:	package/mtdev2tuio/
-F:	package/qtuio/
 
 N:	Steve Calfee <[email protected]>
 F:	package/python-pymysql/
package/Config.in +0 -1
index 9907221b68..250dbe7f0e 100644
@@ -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
package/qtuio/0001-TuioServer.cpp-add-missing-include.patch deleted +0 -28
deleted file mode 100644
index 99337026df..0000000000
@@ -1,28 +0,0 @@
-From 4dd7cad8c95484a882eaa2aeaa74595a3dd93a07 Mon Sep 17 00:00:00 2001
-From: Stephan Hoffmann <[email protected]>
-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 <[email protected]>
----
- 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
-
package/qtuio/0002-dont-append-_d-for-debug.patch deleted +0 -29
deleted file mode 100644
index fbaaf19222..0000000000
@@ -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 <[email protected]>
----
- 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
package/qtuio/Config.in deleted +0 -22
deleted file mode 100644
index f46f1dd407..0000000000
@@ -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
package/qtuio/qtuio.hash deleted +0 -2
deleted file mode 100644
index bb9bdb1848..0000000000
@@ -1,2 +0,0 @@
-# locally computed
-sha256  65308adb59e910d552d4885772c7f99c7d19dec5e924d852a5a39a1972f8d223  qtuio-abe4973ff60654aad9df7037c4ca15c45f811d24.tar.gz
package/qtuio/qtuio.mk deleted +0 -72

72 lines not on this page · raw message

Signature · 1 line
2.11.0
#10 lore raw

PATCH 11/16 package/libmediaart: remove qt4 support

In reply to Peter Korsgaard

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

---
 package/libmediaart/Config.in      | 9 ++++-----
 package/libmediaart/libmediaart.mk | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)
package/libmediaart/Config.in +4 -5
index e073677395..c11d6f49d9 100644
@@ -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
 
package/libmediaart/libmediaart.mk +1 -3
index f64210c266..a81542ac69 100644
@@ -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
Signature · 1 line
2.11.0
#11 lore raw

PATCH 12/16 package/qextserialport: remove qt4 support

In reply to Peter Korsgaard

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

---
 package/qextserialport/Config.in         |  2 +-
 package/qextserialport/qextserialport.mk | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)
package/qextserialport/Config.in +1 -1
index 4e7ef13784..f880d335e5 100644
@@ -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
 
package/qextserialport/qextserialport.mk +2 -8
index e3e325ce6c..ecaff21efc 100644
@@ -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
Signature · 1 line
2.11.0
#12 lore raw

PATCH 13/16 package/gjson: remove qt4 support

In reply to Peter Korsgaard

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

---
 package/qjson/Config.in | 4 ++--
 package/qjson/qjson.mk  | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)
package/qjson/Config.in +2 -2
index 5c423bf317..243a6c1229 100644
@@ -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
package/qjson/qjson.mk +1 -3
index 1777b9454c..718d6622a8 100644
@@ -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
 
Signature · 1 line
2.11.0
#13 lore raw

PATCH 14/16 package/quazip: remove qt4 support

In reply to 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.

---
 package/quazip/Config.in |  1 +
 package/quazip/quazip.mk | 11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)
package/quazip/Config.in +1 -0
index 83537d4613..e980297558 100644
@@ -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
package/quazip/quazip.mk +2 -9
index 872340ab40..aba8274506 100644
@@ -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
Signature · 1 line
2.11.0
#14 lore raw

PATCH 15/16 package/qwt: remove qt4 support

In reply to Peter Korsgaard

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

---
 package/qwt/Config.in | 20 ++++++++------------
 package/qwt/qwt.mk    | 10 ++--------
 2 files changed, 10 insertions(+), 20 deletions(-)
package/qwt/Config.in +8 -12
index 041c2d102c..f4132c8638 100644
@@ -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
package/qwt/qwt.mk +2 -8
index 619453bfc9..f381ebbb7a 100644
@@ -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
Signature · 1 line
2.11.0
#15 lore raw

PATCH 16/16 package/qt: remove package

In reply to 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.

---
 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
Config.in.legacy +6 -0
index 9c38abdc41..25b48fba82 100644
@@ -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
package/Config.in +1 -2
index 250dbe7f0e..9d023b94fe 100644
@@ -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"
package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch deleted +0 -29
deleted file mode 100644
index 4cec4bde52..0000000000
@@ -1,29 +0,0 @@
-From b8f98d956501dfa4ce03a137f15d404930a56066 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <[email protected]>
-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 <[email protected]>
-[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 <[email protected]>
----
- 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
- 
package/qt/0002-configure.patch deleted +0 -52

52 lines not on this page · raw message

package/qt/0003-eglwsegl-use-system.patch deleted +0 -802

802 lines not on this page · raw message

package/qt/0004-fix-const-atomics.patch deleted +0 -50

50 lines not on this page · raw message

package/qt/0005-pthread_getattr_np.patch deleted +0 -107

107 lines not on this page · raw message

package/qt/0006-script-qtdbus-no-gui.patch deleted +0 -22
deleted file mode 100644
index e29e9e4a1b..0000000000
@@ -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 <[email protected]>
----
- 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
package/qt/0007-Add-initial-support-of-ARC-architecture.patch deleted +0 -183

183 lines not on this page · raw message

package/qt/0008-Prevent-unaligned-access-on-ARC.patch deleted +0 -92

92 lines not on this page · raw message

package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch deleted +0 -163

163 lines not on this page · raw message

package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch deleted +0 -43

43 lines not on this page · raw message

package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch deleted +0 -116

116 lines not on this page · raw message

package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch deleted +0 -60

60 lines not on this page · raw message

package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch deleted +0 -37
deleted file mode 100644
index 645041acfe..0000000000
@@ -1,37 +0,0 @@
-From 2281fa50f6e13278d3fd4f028377b8249b7b3cdb Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-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 <[email protected]>
----
- 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
-
package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch deleted +0 -50

50 lines not on this page · raw message

package/qt/0015-configure-fix-build-on-non-x86-platforms.patch deleted +0 -146

146 lines not on this page · raw message

package/qt/Config.gfx.in deleted +0 -31
deleted file mode 100644
index 5e6619c7b8..0000000000
@@ -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
package/qt/Config.in deleted +0 -543

543 lines not on this page · raw message

package/qt/Config.keyboard.in deleted +0 -12
deleted file mode 100644
index b0425471ed..0000000000
@@ -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
package/qt/Config.mouse.in deleted +0 -26
deleted file mode 100644
index 1062facb6a..0000000000
@@ -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
package/qt/Config.sql.in deleted +0 -64

64 lines not on this page · raw message

package/qt/powervr.ini deleted +0 -2
deleted file mode 100644
index 57863ebc44..0000000000
@@ -1,2 +0,0 @@
-[default]
-WindowSystem=libpvrQWSWSEGL.so.1
package/qt/qt.hash deleted +0 -3
deleted file mode 100644
index 301010cae1..0000000000
@@ -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
package/qt/qt.mk deleted +0 -725

344 lines not on this page · raw message

package/qt5/Config.in +0 -2
index 735824402e..a50b57a821 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.11.0

Part of the diff is not shown here. View the raw message.

#16 lore raw

PATCH 1/16 package/gnuradio: remove qtgui option

In reply to Peter Korsgaard

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

Quoted 83 lines · On Wed, 6 Feb 2019 15:10:43 +0100 Peter Korsgaard <[email protected]> wrote:

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

---
 Config.in.legacy             |  6 ++++++
 package/gnuradio/Config.in   | 10 ----------
 package/gnuradio/gnuradio.mk | 10 ++--------
 3 files changed, 8 insertions(+), 18 deletions(-)
Config.in.legacy +6 -0
index be2f722b05..c84a9239a7 100644
@@ -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
package/gnuradio/Config.in +0 -10
index 533a49c81e..3fdaea850e 100644
@@ -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
package/gnuradio/gnuradio.mk +2 -8
index 564ad8b2a4..d6d07f6566 100644
@@ -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
Signature · 6 lines
2.11.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
#17 lore raw

PATCH 1/16 package/gnuradio: remove qtgui option

Hello,

Quoted 5 lines · On Wed, 6 Feb 2019 15:39:50 +0100 Gwenhael Goavec-Merou <[email protected]>…

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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#18 lore raw

PATCH 1/16 package/gnuradio: remove qtgui option

Quoted 11 lines · Thomas Petazzoni

Hello,

Quoted 5 lines · On Wed, 6 Feb 2019 15:39:50 +0100 Gwenhael Goavec-Merou <[email protected]>…

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;

Quoted 6 lines

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