qt5: version bump 5.6.3 -> 5.12.1

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 139 insertions, 33 deletions

diff --git a/rules/qt5.in b/rules/qt5.in
index 1a7b7467d..91bd420f1 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -12,57 +12,63 @@ menuconfig QT5
 	select GCCLIBS_GCC_S
 	select ZLIB
 	select DBUS			if QT5_DBUS || QT5_MODULE_QTWEBENGINE
-	select GLIB			if QT5_GLIB || QT5_MODULE_QTWEBENGINE
-	select LIBPNG			if QT5_LIBPNG
-	select LIBJPEG			if QT5_LIBJPEG
+	select GLIB			if QT5_GLIB
+	select LIBPNG			if QT5_LIBPNG || QT5_MODULE_QTWEBENGINE
+	select HOST_LIBPNG		if QT5_MODULE_QTWEBENGINE
+	select LIBJPEG			if QT5_LIBJPEG || QT5_MODULE_QTWEBENGINE
 	select LIBMNG			if QT5_LIBMNG
 	select ICU			if QT5_ICU
 	select SYSTEMD			if QT5_JOURNALD
 	select OPENSSL			if QT5_OPENSSL
-	select LIBDRM			if QT5_PLATFORM_EGLFS_KMS || QT5_MODULE_QTWEBENGINE && QT5_PLATFORM_XCB
+	select LIBDRM			if QT5_PLATFORM_BACKEND_KMS || QT5_MODULE_QTWEBENGINE && QT5_PLATFORM_XCB
 	select MESALIB			if QT5_OPENGL_DESKTOP || QT5_PLATFORM_EGLFS_KMS
 	select MESALIB_GBM		if QT5_PLATFORM_EGLFS_KMS
-	select MESALIB_EGL		if QT5_PLATFORM_EGLFS_KMS || QT5_MODULE_QTWAYLAND_MESA
+	select MESALIB_EGL		if QT5_PLATFORM_EGLFS_KMS || QT5_MODULE_QTWAYLAND_MESA || QT5_PLATFORM_XCB
 	select MESALIB_EGL_DRM		if QT5_PLATFORM_EGLFS_KMS
 	select MESALIB_EGL_WAYLAND	if QT5_MODULE_QTWAYLAND_MESA
 	select PLATFORM_OPENGL		if QT5_OPENGL_ES2
 	select SQLITE			if QT5_MODULE_QTBASE_SQL_SQLITE
 	select MYSQLDB			if QT5_MODULE_QTBASE_SQL_MYSQL
-	select FONTCONFIG		if QT5_GUI
+	select FONTCONFIG		if QT5_GUI || QT5_MODULE_QTWEBENGINE
 	select FREETYPE			if QT5_GUI
-	select UDEV			if QT5_GUI || QT5_INPUT_LIBINPUT
-	select UDEV_LIBUDEV		if QT5_GUI
+	select UDEV			if QT5_LIBUDEV
+	select UDEV_LIBUDEV		if QT5_LIBUDEV
 	select TSLIB			if QT5_INPUT_TSLIB
 	select LIBINPUT			if QT5_INPUT_LIBINPUT
-	select LIBXCB			if QT5_PLATFORM_XCB
-	select LIBXKBCOMMON		if QT5_PLATFORM_XCB || QT5_INPUT_LIBINPUT
+	select LIBXCB			if QT5_PLATFORM_XCB || QT5_PLATFORM_EGLFS_X11
+	select LIBXKBCOMMON		if QT5_LIBXKBCOMMON
 	select LIBXKBCOMMON_X11		if QT5_PLATFORM_XCB
 	select XCB_UTIL			if QT5_PLATFORM_XCB
+	select XCB_UTIL_WM		if QT5_PLATFORM_XCB
 	select XCB_UTIL_IMAGE		if QT5_PLATFORM_XCB
 	select XCB_UTIL_KEYSYMS		if QT5_PLATFORM_XCB
 	select XCB_UTIL_RENDERUTIL	if QT5_PLATFORM_XCB
-	select XCB_UTIL_WM		if QT5_PLATFORM_XCB
-	select XORG_LIB_X11		if QT5_X11
+	select XORG_LIB_X11		if QT5_X11 || QT5_PLATFORM_EGLFS_X11
 	select XORG_LIB_XI		if QT5_XI
 	select XORG_LIB_XV		if QT5_XV
 	select XORG_LIB_XEXT		if QT5_XV
-	select XORG_LIB_XRENDER		if QT5_XRENDER
 	select XORG_LIB_XCOMPOSITE	if QT5_MODULE_QTWEBENGINE && QT5_PLATFORM_XCB
 	select XORG_LIB_XCURSOR		if QT5_MODULE_QTWEBENGINE && QT5_PLATFORM_XCB
 	select XORG_LIB_XRANDR		if QT5_MODULE_QTWEBENGINE && QT5_PLATFORM_XCB
 	select XORG_LIB_XSCRNSAVER	if QT5_MODULE_QTWEBENGINE && QT5_PLATFORM_XCB
 	select XORG_LIB_XTST		if QT5_MODULE_QTWEBENGINE && QT5_PLATFORM_XCB
-	select LIBXML2			if QT5_MODULE_QTWEBENGINE
-	select LIBXML2_CATALOG		if QT5_MODULE_QTWEBENGINE
-	select LIBXML2_READER		if QT5_MODULE_QTWEBENGINE
-	select LIBXML2_WRITER		if QT5_MODULE_QTWEBENGINE
-	select LIBXSLT			if QT5_MODULE_QTWEBENGINE
-	select ALSA_LIB			if QT5_MODULE_QTMULTIMEDIA
-	select ALSA_LIB_PCM		if QT5_MODULE_QTMULTIMEDIA
+	select OPUS			if QT5_MODULE_QTWEBENGINE
+	select NSPR			if QT5_MODULE_QTWEBENGINE
+	select HOST_NSPR		if QT5_MODULE_QTWEBENGINE
+	select NSS			if QT5_MODULE_QTWEBENGINE
+	select HOST_NSS			if QT5_MODULE_QTWEBENGINE
+	select HOST_NINJA		if QT5_MODULE_QTWEBENGINE
+	select ALSA_LIB			if QT5_MODULE_QTMULTIMEDIA || QT5_MODULE_QTWEBENGINE
+	select ALSA_LIB_MIXER		if QT5_MODULE_QTWEBENGINE
+	select ALSA_LIB_HWDEP		if QT5_MODULE_QTWEBENGINE
+	select ALSA_LIB_PCM		if QT5_MODULE_QTMULTIMEDIA || QT5_MODULE_QTWEBENGINE
+	select ALSA_LIB_RAWMIDI		if QT5_MODULE_QTWEBENGINE
+	select ALSA_LIB_SEQ		if QT5_MODULE_QTWEBENGINE
 	select GSTREAMER1		if QT5_MODULE_QTMULTIMEDIA_GST
 	select GST_PLUGINS_BASE1	if QT5_MODULE_QTMULTIMEDIA_GST
 	select WAYLAND			if QT5_MODULE_QTWAYLAND
 	select QT5_MODULE_QTBASE
+	select QT5_MODULE_QTBASE_SQL	if QT5_MODULE_QTDECLARATIVE
 	prompt "qt5                           "
 	help
 	  Qt is a full development framework with tools designed to
@@ -74,6 +80,10 @@ if QT5
 config QT5_PREPARE_EXAMPLES
 	bool
 
+config QT5_LIBXKBCOMMON
+	bool
+	default QT5_PLATFORM_XCB || QT5_MODULE_QTWAYLAND || QT5_INPUT_LIBINPUT
+
 if QT5_PLATFORM_XCB
 
 config QT5_X11
@@ -88,10 +98,6 @@ config QT5_XV
 	bool
 	default QT5_MODULE_QTMULTIMEDIA
 
-config QT5_XRENDER
-	bool
-	default y
-
 endif
 
 menu "Feature Options             "
@@ -132,6 +138,9 @@ config QT5_GLIB
 	bool
 	prompt "glib support"
 
+config QT5_LIBUDEV
+	bool
+
 config QT5_JOURNALD
 	bool
 	depends on INITMETHOD_SYSTEMD
@@ -175,6 +184,7 @@ endmenu
 
 menuconfig QT5_GUI
 	bool
+	select QT5_LIBUDEV
 	prompt "GUI Platform Plugins        "
 
 if QT5_GUI
@@ -188,6 +198,10 @@ config QT5_PLATFORM_DEFAULT
 	default "linuxfb"	if QT5_PLATFORM_DEFAULT_LINUXFB
 	default "wayland"	if QT5_PLATFORM_DEFAULT_WAYLAND
 
+config QT5_PLATFORM_BACKEND_KMS
+	bool
+	default QT5_PLATFORM_EGLFS_KMS || QT5_PLATFORM_LINUXFB_KMS
+
 config QT5_PLATFORM_XCB
 	bool
 	prompt "XCB"
@@ -203,12 +217,30 @@ config QT5_PLATFORM_EGLFS_KMS
 	default y
 	prompt "KMS/GBM backend"
 
+config QT5_PLATFORM_EGLFS_X11
+	bool
+	default y
+	prompt "X11 backend"
+
 endif
 
 config QT5_PLATFORM_LINUXFB
 	bool
 	prompt "LinuxFB"
 
+if QT5_PLATFORM_LINUXFB
+
+config QT5_PLATFORM_LINUXFB_KMS
+	bool
+	default y
+	prompt "LinuxFB KMS backend"
+
+endif
+
+config QT5_PLATFORM_VNC
+	bool
+	prompt "VNC"
+
 comment "default plugin"
 
 choice
@@ -240,6 +272,11 @@ config QT5_PLATFORM_DEFAULT_LINUXFB
 	depends on QT5_PLATFORM_LINUXFB
 	prompt "LinuxFB"
 
+config QT5_PLATFORM_DEFAULT_VNC
+	bool
+	depends on QT5_PLATFORM_VNC
+	prompt "VNC"
+
 config QT5_PLATFORM_DEFAULT_WAYLAND
 	bool
 	depends on QT5_MODULE_QTWAYLAND
@@ -259,11 +296,13 @@ menu "Input Plugins               "
 
 config QT5_INPUT_EVDEV
 	bool
+	select QT5_LIBUDEV
 	default y
 	prompt "evdev"
 
 config QT5_INPUT_LIBINPUT
 	bool
+	select QT5_LIBUDEV
 	prompt "libinput"
 
 config QT5_INPUT_TSLIB
@@ -279,7 +318,7 @@ menu "Modules                     "
 config QT5_MODULE_QT3D
 	bool
 	select QT5_MODULE_QTDECLARATIVE
-	select QT5_MODULE_QTIMAGEFORMATS
+	select QT5_MODULE_QTGRAPHICALEFFECTS
 	prompt "Qt3D"
 
 config QT5_MODULE_QT3D_QUICK
@@ -344,6 +383,15 @@ config QT5_MODULE_QTCANVAS3D_QUICK
 	depends on QT5_MODULE_QTCANVAS3D
 	default QT5_MODULE_QTDECLARATIVE
 
+config QT5_MODULE_QTCHARTS
+	bool
+	prompt "QtCharts"
+
+config QT5_MODULE_QTCHARTS_QUICK
+	bool
+	depends on QT5_MODULE_QTCHARTS
+	default QT5_MODULE_QTDECLARATIVE
+
 config QT5_MODULE_QTCONNECTIVITY
 	bool
 	prompt "QtConnectivity"
@@ -353,6 +401,17 @@ config QT5_MODULE_QTCONNECTIVITY_QUICK
 	depends on QT5_MODULE_QTCONNECTIVITY
 	default QT5_MODULE_QTDECLARATIVE
 
+config QT5_MODULE_QTDATAVIS3D
+	bool
+	select QT5_MODULE_QTBASE_WIDGETS
+	select QT5_OPENGL
+	prompt "QtDataVisualization"
+
+config QT5_MODULE_QTDATAVIS3D_QUICK
+	bool
+	depends on QT5_MODULE_QTDATAVIS3D
+	default QT5_MODULE_QTDECLARATIVE
+
 config QT5_MODULE_QTDECLARATIVE
 	bool
 	select QT5_OPENGL
@@ -386,11 +445,15 @@ config QT5_MODULE_QTDECLARATIVE_ACCESSIBILITY
 
 endif
 
-config QT5_MODULE_QTENGINIO
+config QT5_MODULE_QTGAMEPAD
 	bool
-	select QT5_MODULE_QTDECLARATIVE
-	select QT5_OPENSSL
-	prompt "QtEnginio"
+	select QT5_INPUT_EVDEV
+	prompt "QtGamepad"
+
+config QT5_MODULE_QTGAMEPAD_QUICK
+	bool
+	depends on QT5_MODULE_QTGAMEPAD
+	default QT5_MODULE_QTDECLARATIVE
 
 config QT5_MODULE_QTGRAPHICALEFFECTS
 	bool
@@ -416,6 +479,15 @@ config QT5_MODULE_QTMULTIMEDIA
 	depends on QT5_GUI
 	prompt "QtMultimedia"
 
+config QT5_MODULE_QTNETWORKAUTH
+	bool
+	prompt "QtNetworkAuth"
+
+config QT5_MODULE_QTPURCHASING
+	bool
+	select QT5_MODULE_QTDECLARATIVE
+	prompt "QtPurchasing"
+
 config QT5_MODULE_QTMULTIMEDIA_GST
 	bool
 	default y
@@ -439,9 +511,19 @@ config QT5_MODULE_QTQUICKCONTROLS
 
 config QT5_MODULE_QTQUICKCONTROLS2
 	bool
-	select QT5_MODULE_QTQUICKCONTROLS
+	select QT5_MODULE_QTDECLARATIVE
+	select QT5_MODULE_QTGRAPHICALEFFECTS
 	prompt "QtQuickControls2"
 
+config QT5_MODULE_QTREMOTEOBJECTS
+	bool
+	prompt "QtRemoteObjects"
+
+config QT5_MODULE_QTREMOTEOBJECTS_QUICK
+	bool
+	depends on QT5_MODULE_QTREMOTEOBJECTS
+	default QT5_MODULE_QTDECLARATIVE
+
 config QT5_MODULE_QTSCRIPT
 	bool
 	prompt "QtScript"
@@ -450,6 +532,15 @@ config QT5_MODULE_QTSCRIPT_WIDGETS
 	bool
 	default QT5_MODULE_QTSCRIPT && QT5_WIDGETS
 
+config QT5_MODULE_QTSCXML
+	bool
+	prompt "QtScxml"
+
+config QT5_MODULE_QTSCXML_QUICK
+	bool
+	depends on QT5_MODULE_QTSCXML
+	default QT5_MODULE_QTDECLARATIVE
+
 config QT5_MODULE_QTSENSORS
 	bool
 	prompt "QtSensors"
@@ -468,6 +559,10 @@ config QT5_MODULE_QTSERIALPORT
 	bool
 	prompt "QtSerialPort"
 
+config QT5_MODULE_QTSPEECH
+	bool
+	prompt "QtSpeech"
+
 config QT5_MODULE_QTSVG
 	bool
 	prompt "QtSvg"
@@ -491,6 +586,12 @@ config QT5_MODULE_QTTRANSLATIONS
 	select QT5_MODULE_QTTOOLS
 	prompt "QtTranslations"
 
+config QT5_MODULE_QTVIRTUALKEYBOARD
+	bool
+	select QT5_MODULE_QTSVG
+	select QT5_MODULE_QTDECLARATIVE
+	prompt "QtVirtualKeyboard"
+
 config QT5_MODULE_QTWAYLAND
 	bool
 	depends on QT5_GUI
@@ -500,7 +601,7 @@ config QT5_MODULE_QTWAYLAND
 
 config QT5_MODULE_QTWAYLAND_MESA
 	bool
-	depends on MESALIB
+	depends on MESALIB && QT5_OPENGL
 	default QT5_MODULE_QTWAYLAND
 
 
@@ -517,9 +618,9 @@ config QT5_MODULE_QTWEBCHANNEL_QUICK
 config QT5_MODULE_QTWEBENGINE
 	bool
 	select QT5_GUI
-	select QT5_ICU
 	select QT5_OPENSSL
-	select QT5_MODULE_QTQUICKCONTROLS
+	select QT5_MODULE_QTDECLARATIVE
+	select QT5_MODULE_QTQUICKCONTROLS2 if QT5_PREPARE_EXAMPLES
 	select QT5_MODULE_QTWEBCHANNEL
 	prompt "QtWebEngine"
 
@@ -531,6 +632,11 @@ config QT5_MODULE_QTWEBENGINE_WIDGETS
 
 endif
 
+config QT5_MODULE_QTWEBGLPLUGIN
+	bool
+	select QT5_MODULE_QTWEBSOCKETS
+	prompt "QtWebGLPlugin"
+
 config QT5_MODULE_QTWEBSOCKETS
 	bool
 	prompt "QtWebSockets"