qt5: version bump 5.4.2 -> 5.6.0

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

1 files changed, 82 insertions, 82 deletions

diff --git a/rules/qt5.in b/rules/qt5.in
index 17db966ac..9cdd9c268 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -3,7 +3,6 @@
 menuconfig QT5
 	tristate
 	select HOST_SYSTEM_PERL
-	select HOST_SYSTEM_RUBY		if QT5_MODULE_QTWEBKIT
 	select LIBC_PTHREAD
 	select LIBC_DL
 	select LIBC_RT
@@ -17,22 +16,25 @@ menuconfig QT5
 	select LIBJPEG			if QT5_LIBJPEG
 	select LIBMNG			if QT5_LIBMNG
 	select ICU			if QT5_ICU
-	select LIBDRM			if QT5_PLATFORM_KMS || QT5_MODULE_QTWEBENGINE && QT5_PLATFORM_XCB
-	select MESALIB			if QT5_OPENGL_DESKTOP || QT5_PLATFORM_KMS
-	select MESALIB_GBM		if QT5_PLATFORM_KMS
-	select MESALIB_EGL		if QT5_MODULE_QTWAYLAND_MESA
+	select SYSTEMD			if QT5_JOURNALD
+	select OPENSSL			if QT5_OPENSSL
+	select LIBDRM			if QT5_PLATFORM_EGLFS_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_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 OPENSSL			if QT5_OPENSSL
 	select FONTCONFIG		if QT5_GUI
 	select FREETYPE			if QT5_GUI
-	select UDEV			if QT5_GUI
+	select UDEV			if QT5_GUI || QT5_INPUT_LIBINPUT
 	select UDEV_LIBUDEV		if QT5_GUI
 	select TSLIB			if QT5_INPUT_TSLIB
 	select DIRECTFB			if QT5_PLATFORM_DIRECTFB
+	select LIBINPUT			if QT5_INPUT_LIBINPUT
 	select LIBXCB			if QT5_PLATFORM_XCB
-	select LIBXKBCOMMON		if QT5_PLATFORM_XCB
+	select LIBXKBCOMMON		if QT5_PLATFORM_XCB || QT5_INPUT_LIBINPUT
 	select LIBXKBCOMMON_X11		if QT5_PLATFORM_XCB
 	select XCB_UTIL			if QT5_PLATFORM_XCB
 	select XORG_LIB_X11		if QT5_X11
@@ -41,15 +43,17 @@ menuconfig QT5
 	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_WRITER		if QT5_MODULE_QTWEBENGINE
+	select LIBXSLT			if QT5_MODULE_QTWEBENGINE
 	select ALSA_LIB			if QT5_MODULE_QTMULTIMEDIA
-	select GSTREAMER		if QT5_MODULE_QTMULTIMEDIA_GST
-	select GST_PLUGINS_BASE		if QT5_MODULE_QTMULTIMEDIA_GST
-	select LIBXML2			if QT5_MODULE_QTWEBKIT
-	select LIBXML2_READER		if QT5_MODULE_QTWEBKIT
-	select LIBXSLT			if QT5_MODULE_QTWEBKIT
-	select GSTREAMER1		if QT5_MODULE_QTWEBKIT_VIDEO
-	select GST_PLUGINS_BASE1	if QT5_MODULE_QTWEBKIT_VIDEO
+	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
 	prompt "qt5                           "
@@ -121,6 +125,10 @@ config QT5_GLIB
 	bool
 	prompt "glib support"
 
+config QT5_JOURNALD
+	bool
+	prompt "journald support"
+
 config QT5_OPENSSL
 	bool
 	prompt "OpenSSL support"
@@ -150,10 +158,6 @@ config QT5_OPENGL_API
 
 endif
 
-config QT5_CXX11
-	bool
-	prompt "C++11 support"
-
 endmenu
 
 menuconfig QT5_GUI
@@ -170,7 +174,6 @@ config QT5_PLATFORM_DEFAULT
 	default "eglfs"		if QT5_PLATFORM_DEFAULT_EGLFS
 	default "directfb"	if QT5_PLATFORM_DEFAULT_DIRECTFB
 	default "linuxfb"	if QT5_PLATFORM_DEFAULT_LINUXFB
-	default "kms"		if QT5_PLATFORM_DEFAULT_KMS
 	default "wayland"	if QT5_PLATFORM_DEFAULT_WAYLAND
 
 config QT5_PLATFORM_XCB
@@ -179,22 +182,27 @@ config QT5_PLATFORM_XCB
 
 config QT5_PLATFORM_EGLFS
 	bool
-	depends on QT5_OPENGL_ES2
 	prompt "eglfs"
 
+if QT5_PLATFORM_EGLFS
+
+config QT5_PLATFORM_EGLFS_KMS
+	bool
+	default y
+	prompt "KMS/GBM backend"
+
+endif
+
 config QT5_PLATFORM_DIRECTFB
 	bool
+	# fails to build for Qt 5.6.0
+	depends on BROKEN
 	prompt "DirectFB"
 
 config QT5_PLATFORM_LINUXFB
 	bool
 	prompt "LinuxFB"
 
-config QT5_PLATFORM_KMS
-	bool
-	depends on QT5_OPENGL_ES2
-	prompt "KMS"
-
 comment "default plugin"
 
 choice
@@ -232,11 +240,6 @@ config QT5_PLATFORM_DEFAULT_LINUXFB
 	depends on QT5_PLATFORM_LINUXFB
 	prompt "LinuxFB"
 
-config QT5_PLATFORM_DEFAULT_KMS
-	bool
-	depends on QT5_PLATFORM_KMS
-	prompt "KMS"
-
 config QT5_PLATFORM_DEFAULT_WAYLAND
 	bool
 	depends on QT5_MODULE_QTWAYLAND
@@ -259,6 +262,10 @@ config QT5_INPUT_EVDEV
 	default y
 	prompt "evdev"
 
+config QT5_INPUT_LIBINPUT
+	bool
+	prompt "libinput"
+
 config QT5_INPUT_TSLIB
 	bool
 	prompt "tslib"
@@ -269,6 +276,17 @@ endif
 
 menu "Modules                     "
 
+config QT5_MODULE_QT3D
+	bool
+	select QT5_MODULE_QTDECLARATIVE
+	select QT5_MODULE_QTGRAPHICALEFFECTS
+	prompt "Qt3D"
+
+config QT5_MODULE_QT3D_QUICK
+	bool
+	depends on QT5_MODULE_QT3D
+	default QT5_MODULE_QTDECLARATIVE
+
 config QT5_MODULE_QTBASE
 	bool
 	prompt "QtBase"
@@ -307,6 +325,16 @@ endif
 
 endif
 
+config QT5_MODULE_QTCANVAS3D
+	bool
+	select QT5_MODULE_QTDECLARATIVE
+	prompt "QtCanvas3D"
+
+config QT5_MODULE_QTCANVAS3D_QUICK
+	bool
+	depends on QT5_MODULE_QTCANVAS3D
+	default QT5_MODULE_QTDECLARATIVE
+
 config QT5_MODULE_QTCONNECTIVITY
 	bool
 	prompt "QtConnectivity"
@@ -335,6 +363,10 @@ config QT5_MODULE_QTDECLARATIVE_QUICK
 	bool
 	default QT5_MODULE_QTDECLARATIVE && QT5_GUI
 
+config QT5_MODULE_QTDECLARATIVE_QUICK_DEBUG
+	bool
+	default QT5_MODULE_QTDECLARATIVE_QUICK && QT5_MODULE_QTDECLARATIVE_DEBUG
+
 config QT5_MODULE_QTDECLARATIVE_ACCESSIBILITY
 	bool
 	default QT5_MODULE_QTDECLARATIVE && QT5_ACCESSIBILITY
@@ -385,26 +417,6 @@ config QT5_MODULE_QTMULTIMEDIA_WIDGETS
 	bool
 	default QT5_MODULE_QTMULTIMEDIA && QT5_WIDGETS
 
-config QT5_MODULE_QTQUICK1
-	bool
-	depends on QT5_GUI
-	select QT5_MODULE_QTBASE_WIDGETS
-	select QT5_MODULE_QTBASE_SQL
-	select QT5_MODULE_QTSCRIPT
-	prompt "QtQuick1"
-
-if QT5_MODULE_QTQUICK1
-
-config QT5_MODULE_QTQUICK1_DEBUG
-	bool
-	prompt "QML debugging"
-
-endif
-
-config QT5_MODULE_QTQUICK1_WEBKIT
-	bool
-	default QT5_MODULE_QTQUICK1 && QT5_MODULE_QTWEBKIT
-
 config QT5_MODULE_QTQUICKCONTROLS
 	bool
 	select QT5_ACCESSIBILITY
@@ -412,6 +424,11 @@ config QT5_MODULE_QTQUICKCONTROLS
 	select QT5_GUI
 	prompt "QtQuickControls"
 
+config QT5_MODULE_QTQUICKCONTROLS2
+	bool
+	select QT5_MODULE_QTQUICKCONTROLS
+	prompt "QtQuickControls2"
+
 config QT5_MODULE_QTSCRIPT
 	bool
 	prompt "QtScript"
@@ -429,6 +446,10 @@ config QT5_MODULE_QTSENSORS_QUICK
 	depends on QT5_MODULE_QTSENSORS
 	default QT5_MODULE_QTDECLARATIVE
 
+config QT5_MODULE_QTSERIALBUS
+	bool
+	prompt "QtSerialBus"
+
 config QT5_MODULE_QTSERIALPORT
 	bool
 	prompt "QtSerialPort"
@@ -478,7 +499,9 @@ config QT5_MODULE_QTWEBENGINE
 	bool
 	select QT5_GUI
 	select QT5_ICU
+	select QT5_OPENSSL
 	select QT5_MODULE_QTQUICKCONTROLS
+	select QT5_MODULE_QTWEBCHANNEL
 	prompt "QtWebEngine"
 
 if QT5_MODULE_QTWEBENGINE
@@ -489,43 +512,20 @@ config QT5_MODULE_QTWEBENGINE_WIDGETS
 
 endif
 
-config QT5_MODULE_QTWEBKIT
+config QT5_MODULE_QTWEBSOCKETS
 	bool
-	depends on QT5_GUI
-	select QT5_ICU
-	select QT5_MODULE_QTBASE_SQL
-	prompt "QtWebKit"
-
-if QT5_MODULE_QTWEBKIT
+	prompt "QtWebSockets"
 
-config QT5_MODULE_QTWEBKIT_QUICK
+config QT5_MODULE_QTWEBSOCKETS_QUICK
 	bool
+	depends on QT5_MODULE_QTWEBSOCKETS
 	default QT5_MODULE_QTDECLARATIVE
 
-config QT5_MODULE_QTWEBKIT_VIDEO
+config QT5_MODULE_QTWEBVIEW
 	bool
-	prompt "video support (with gstreamer 1.x)"
-
-config QT5_MODULE_QTWEBKIT_WIDGETS
-	bool
-	default QT5_WIDGETS
-
-# FIXME: xml2/xslt deps
-# FIXME: enable/disable dep detection
-
-endif
-
-config QT5_MODULE_QTWEBKIT_EXAMPLES
-	bool
-	depends on QT5_GUI
-	select QT5_MODULE_QTBASE_WIDGETS
-	select QT5_MODULE_QTWEBKIT
-	select QT5_MODULE_QTTOOLS
-	select QT5_MODULE_QTXMLPATTERNS
-
-config QT5_MODULE_QTWEBSOCKETS
-	bool
-	prompt "QtWebSockets"
+	select QT5_MODULE_QTDECLARATIVE
+	select QT5_MODULE_QTWEBENGINE
+	prompt "QtWebView"
 
 config QT5_MODULE_QTX11EXTRAS
 	bool