[Buildroot] [PATCH 0/5] Bump QT 5.8.0-beta

[Buildroot] [PATCH 0/5] Bump QT 5.8.0-beta

[Andreas Naumann]

I'm currently playing around with qt5.8 and might as well ask for comments.

I've done some testing on IMX6 and SAMA5D3 and things seem to do fine, 
especially GPU-less QML which is motivation for this.
Compile only tested with a ras-pi defconfig.

This series removes the hashes for now since they will change again anyway.


Andreas Naumann (5):
  qt5: bump to 5.8.0-beta
  Revert "qt5base: install bundled fonts to target"
  qt5webkit: bump to 5.8.0-beta
  qt5declarative: enable Quick for non-GL platforms
  quickcontrols1/2: enable for software renderer

 package/qt5/Config.in                              |  7 +--
 package/qt5/qt5.mk                                 |  6 +-
 package/qt5/qt53d/qt53d.hash                       |  2 -
 ...001-directfb-make-platform-plugin-compile.patch | 22 ++++++++
 .../0006-eglfs-rasp-pi-header-inclusion.patch      | 45 ---------------
 package/qt5/qt5base/qt5base.hash                   |  2 -
 package/qt5/qt5base/qt5base.mk                     | 11 +---
 package/qt5/qt5canvas3d/qt5canvas3d.hash           |  2 -
 package/qt5/qt5connectivity/qt5connectivity.hash   |  2 -
 package/qt5/qt5declarative/Config.in               |  4 +-
 package/qt5/qt5declarative/qt5declarative.hash     |  2 -
 package/qt5/qt5enginio/Config.in                   | 13 -----
 package/qt5/qt5enginio/qt5enginio.hash             |  2 -
 package/qt5/qt5enginio/qt5enginio.mk               | 64 ----------------------
 .../qt5graphicaleffects/qt5graphicaleffects.hash   |  2 -
 package/qt5/qt5imageformats/qt5imageformats.hash   |  2 -
 package/qt5/qt5location/qt5location.hash           |  2 -
 package/qt5/qt5multimedia/qt5multimedia.hash       |  2 -
 package/qt5/qt5multimedia/qt5multimedia.mk         |  2 +
 package/qt5/qt5quickcontrols/Config.in             |  3 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.hash |  2 -
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk   |  5 +-
 package/qt5/qt5quickcontrols2/Config.in            |  3 +-
 .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  2 -
 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk |  8 ++-
 package/qt5/qt5script/qt5script.hash               |  2 -
 package/qt5/qt5sensors/qt5sensors.hash             |  2 -
 package/qt5/qt5serialbus/qt5serialbus.hash         |  2 -
 package/qt5/qt5serialport/qt5serialport.hash       |  2 -
 package/qt5/qt5svg/qt5svg.hash                     |  2 -
 package/qt5/qt5tools/qt5tools.hash                 |  2 -
 package/qt5/qt5webchannel/qt5webchannel.hash       |  2 -
 package/qt5/qt5webkit/qt5webkit.hash               |  2 -
 package/qt5/qt5webkit/qt5webkit.mk                 |  3 +-
 package/qt5/qt5websockets/qt5websockets.hash       |  2 -
 package/qt5/qt5x11extras/qt5x11extras.hash         |  2 -
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |  2 -
 37 files changed, 45 insertions(+), 197 deletions(-)
 delete mode 100644 package/qt5/qt53d/qt53d.hash
 create mode 100644 package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
 delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
 delete mode 100644 package/qt5/qt5base/qt5base.hash
 delete mode 100644 package/qt5/qt5canvas3d/qt5canvas3d.hash
 delete mode 100644 package/qt5/qt5connectivity/qt5connectivity.hash
 delete mode 100644 package/qt5/qt5declarative/qt5declarative.hash
 delete mode 100644 package/qt5/qt5enginio/Config.in
 delete mode 100644 package/qt5/qt5enginio/qt5enginio.hash
 delete mode 100644 package/qt5/qt5enginio/qt5enginio.mk
 delete mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
 delete mode 100644 package/qt5/qt5imageformats/qt5imageformats.hash
 delete mode 100644 package/qt5/qt5location/qt5location.hash
 delete mode 100644 package/qt5/qt5multimedia/qt5multimedia.hash
 delete mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.hash
 delete mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
 delete mode 100644 package/qt5/qt5script/qt5script.hash
 delete mode 100644 package/qt5/qt5sensors/qt5sensors.hash
 delete mode 100644 package/qt5/qt5serialbus/qt5serialbus.hash
 delete mode 100644 package/qt5/qt5serialport/qt5serialport.hash
 delete mode 100644 package/qt5/qt5svg/qt5svg.hash
 delete mode 100644 package/qt5/qt5tools/qt5tools.hash
 delete mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash
 delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash
 delete mode 100644 package/qt5/qt5websockets/qt5websockets.hash
 delete mode 100644 package/qt5/qt5x11extras/qt5x11extras.hash
 delete mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash

-- 
1.9.1

[Buildroot] [PATCH 1/5] qt5: bump to 5.8.0-beta

[Andreas Naumann]

Removed all hashes (until final release).

- qt5base: renamed library to EglFSDeviceIntegration ([1])
- qt5base: remove ras-pi patch
- qt5base: remove obsolete config-option -large ([2])
- qt5base: make the directfb platform plugin compile ([3])
- qt53d/quickcontrols2/serialbus: move out of tech-preview
- qt5enginio: remove discontinued module

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ec4eb4db61094179bc6a9ec26ec68fb710177053
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108
[3] Without this patch, qmake is looking for directfb_egl feature which usually is not
    provided (only by some raspi mkspec afaics).

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/qt5/Config.in                              |  7 +--
 package/qt5/qt5.mk                                 |  6 +-
 package/qt5/qt53d/qt53d.hash                       |  2 -
 ...001-directfb-make-platform-plugin-compile.patch | 22 ++++++++
 .../0006-eglfs-rasp-pi-header-inclusion.patch      | 45 ---------------
 package/qt5/qt5base/qt5base.hash                   |  2 -
 package/qt5/qt5base/qt5base.mk                     |  4 +-
 package/qt5/qt5canvas3d/qt5canvas3d.hash           |  2 -
 package/qt5/qt5connectivity/qt5connectivity.hash   |  2 -
 package/qt5/qt5declarative/qt5declarative.hash     |  2 -
 package/qt5/qt5enginio/Config.in                   | 13 -----
 package/qt5/qt5enginio/qt5enginio.hash             |  2 -
 package/qt5/qt5enginio/qt5enginio.mk               | 64 ----------------------
 .../qt5graphicaleffects/qt5graphicaleffects.hash   |  2 -
 package/qt5/qt5imageformats/qt5imageformats.hash   |  2 -
 package/qt5/qt5location/qt5location.hash           |  2 -
 package/qt5/qt5multimedia/qt5multimedia.hash       |  2 -
 package/qt5/qt5quickcontrols/qt5quickcontrols.hash |  2 -
 .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  2 -
 package/qt5/qt5script/qt5script.hash               |  2 -
 package/qt5/qt5sensors/qt5sensors.hash             |  2 -
 package/qt5/qt5serialbus/qt5serialbus.hash         |  2 -
 package/qt5/qt5serialport/qt5serialport.hash       |  2 -
 package/qt5/qt5svg/qt5svg.hash                     |  2 -
 package/qt5/qt5tools/qt5tools.hash                 |  2 -
 package/qt5/qt5webchannel/qt5webchannel.hash       |  2 -
 package/qt5/qt5webkit/qt5webkit.hash               |  2 -
 package/qt5/qt5websockets/qt5websockets.hash       |  2 -
 package/qt5/qt5x11extras/qt5x11extras.hash         |  2 -
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |  2 -
 30 files changed, 29 insertions(+), 178 deletions(-)
 delete mode 100644 package/qt5/qt53d/qt53d.hash
 create mode 100644 package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
 delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
 delete mode 100644 package/qt5/qt5base/qt5base.hash
 delete mode 100644 package/qt5/qt5canvas3d/qt5canvas3d.hash
 delete mode 100644 package/qt5/qt5connectivity/qt5connectivity.hash
 delete mode 100644 package/qt5/qt5declarative/qt5declarative.hash
 delete mode 100644 package/qt5/qt5enginio/Config.in
 delete mode 100644 package/qt5/qt5enginio/qt5enginio.hash
 delete mode 100644 package/qt5/qt5enginio/qt5enginio.mk
 delete mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
 delete mode 100644 package/qt5/qt5imageformats/qt5imageformats.hash
 delete mode 100644 package/qt5/qt5location/qt5location.hash
 delete mode 100644 package/qt5/qt5multimedia/qt5multimedia.hash
 delete mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.hash
 delete mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
 delete mode 100644 package/qt5/qt5script/qt5script.hash
 delete mode 100644 package/qt5/qt5sensors/qt5sensors.hash
 delete mode 100644 package/qt5/qt5serialbus/qt5serialbus.hash
 delete mode 100644 package/qt5/qt5serialport/qt5serialport.hash
 delete mode 100644 package/qt5/qt5svg/qt5svg.hash
 delete mode 100644 package/qt5/qt5tools/qt5tools.hash
 delete mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash
 delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash
 delete mode 100644 package/qt5/qt5websockets/qt5websockets.hash
 delete mode 100644 package/qt5/qt5x11extras/qt5x11extras.hash
 delete mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 234dfdd..a4dc481 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -31,16 +31,18 @@ menuconfig BR2_PACKAGE_QT5
 
 if BR2_PACKAGE_QT5
 source "package/qt5/qt5base/Config.in"
+source "package/qt5/qt53d/Config.in"
 source "package/qt5/qt5canvas3d/Config.in"
 source "package/qt5/qt5connectivity/Config.in"
 source "package/qt5/qt5declarative/Config.in"
-source "package/qt5/qt5enginio/Config.in"
 source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5location/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5quickcontrols/Config.in"
+source "package/qt5/qt5quickcontrols2/Config.in"
 source "package/qt5/qt5sensors/Config.in"
+source "package/qt5/qt5serialbus/Config.in"
 source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5tools/Config.in"
@@ -49,9 +51,6 @@ source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
 comment "technology preview"
-source "package/qt5/qt53d/Config.in"
-source "package/qt5/qt5quickcontrols2/Config.in"
-source "package/qt5/qt5serialbus/Config.in"
 comment "legacy compatibility"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5webkit/Config.in"
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index d25f663..4d5dbf3 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,6 +1,6 @@
-QT5_VERSION_MAJOR = 5.6
-QT5_VERSION = $(QT5_VERSION_MAJOR).2
-QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
+QT5_VERSION_MAJOR = 5.8
+QT5_VERSION = $(QT5_VERSION_MAJOR).0-beta
+QT5_SITE = http://download.qt.io/development_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
 include $(sort $(wildcard package/qt5/*/*.mk))
 
 define QT5_LA_PRL_FILES_FIXUP
diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash
deleted file mode 100644
index 7179380..0000000
--- a/package/qt5/qt53d/qt53d.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qt3d-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941 qt3d-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch b/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
new file mode 100644
index 0000000..96cc3b0
--- /dev/null
+++ b/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
@@ -0,0 +1,22 @@
+diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
+index 406b89e..a83b09f 100644
+--- a/src/plugins/platforms/directfb/directfb.pro
++++ b/src/plugins/platforms/directfb/directfb.pro
+@@ -3,7 +3,7 @@ TARGET = qdirectfb
+ QT += \
+     core-private gui-private \
+     eventdispatcher_support-private service_support-private \
+-    fontdatabase_support-private egl_support-private
++    fontdatabase_support-private
+ 
+ QMAKE_USE += directfb
+ 
+@@ -27,7 +27,7 @@ HEADERS = qdirectfbintegration.h \
+     qdirectfbeglhooks.h
+ 
+ # ### port the GL context
+-qtConfig(directfb_egl) {
++contains(QT_CONFIG, directfb_egl) {
+     HEADERS += qdirectfb_egl.h
+     SOURCES += qdirectfb_egl.cpp
+     DEFINES += DIRECTFB_GL_EGL
diff --git a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
deleted file mode 100644
index f1f6d9b..0000000
--- a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001
-From: Julien Corjon <corjon.j@ecagroup.com>
-Date: Tue, 21 Jul 2015 09:58:14 +0200
-Subject: [PATCH] eglfs - fix rasp-pi header inclusion
-
-eglplateform.h include headers for low level instruction and fail on brcm
-headers inclusion
-  For the brcm presence test we use egl pkg-config file
-  For the eglfs-plugin compilation we use the egl configuration
-
-Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339
-Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
----
- config.tests/qpa/eglfs-brcm/eglfs-brcm.pro   | 2 ++
- src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-index ce16a3a..192a8ad 100644
---- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-@@ -1,6 +1,8 @@
- SOURCES = eglfs-brcm.cpp
- 
- CONFIG -= qt
-+CONFIG += link_pkgconfig
-+PKGCONFIG += egl
- 
- INCLUDEPATH += $$QMAKE_INCDIR_EGL
- 
-diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-index 0f493fd..8479496 100644
---- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
-+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
- load(qt_plugin)
- 
- QT += platformsupport-private eglfs_device_lib-private
-+CONFIG += egl
- 
- SOURCES += $$PWD/qeglfsmain.cpp
- 
--- 
-2.1.0
-
diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
deleted file mode 100644
index 9808e9b..0000000
--- a/package/qt5/qt5base/qt5base.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 qtbase-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 23dba2a..f4ca921 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -41,8 +41,6 @@ else
 QT5BASE_CONFIGURE_OPTS += -release
 endif
 
-QT5BASE_CONFIGURE_OPTS += -largefile
-
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
 QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
@@ -170,7 +168,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglDeviceIntegration
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFSDeviceIntegration
 
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets
diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash
deleted file mode 100644
index 01819e4..0000000
--- a/package/qt5/qt5canvas3d/qt5canvas3d.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtcanvas3d-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad qtcanvas3d-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
deleted file mode 100644
index 4574f3d..0000000
--- a/package/qt5/qt5connectivity/qt5connectivity.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtconnectivity-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 qtconnectivity-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
deleted file mode 100644
index d8d3a68..0000000
--- a/package/qt5/qt5declarative/qt5declarative.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da qtdeclarative-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in
deleted file mode 100644
index fcb866c..0000000
--- a/package/qt5/qt5enginio/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_QT5ENGINIO
-	bool "qt5enginio"
-	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_QT5BASE
-	select BR2_PACKAGE_QT5BASE_GUI
-	select BR2_PACKAGE_QT5BASE_NETWORK
-	help
-	  Qt is a cross-platform application and UI framework for
-	  developers using C++.
-
-	  This package corresponds to the qt5enginio module.
-
-	  http://qt.io
diff --git a/package/qt5/qt5enginio/qt5enginio.hash b/package/qt5/qt5enginio/qt5enginio.hash
deleted file mode 100644
index 9951834..0000000
--- a/package/qt5/qt5enginio/qt5enginio.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtenginio-opensource-src-1.6.2.tar.xz.mirrorlist
-sha256 90ffc38d214a75ab0ef90a4760843f12bc073ae49c17de24c677d1d403bddcc3 qtenginio-opensource-src-1.6.2.tar.xz
diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk
deleted file mode 100644
index ada5fa7..0000000
--- a/package/qt5/qt5enginio/qt5enginio.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-################################################################################
-#
-# qt5enginio
-#
-################################################################################
-
-# Qt5Enginio does not follow Qt versionning
-# see https://bugreports.qt.io/browse/QTBUG-50111
-QT5ENGINIO_VERSION = 1.6.2
-QT5ENGINIO_SITE = $(QT5_SITE)
-QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz
-QT5ENGINIO_DEPENDENCIES = openssl qt5base
-QT5ENGINIO_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5ENGINIO_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-else
-QT5ENGINIO_LICENSE = Commercial license
-QT5ENGINIO_REDISTRIBUTE = NO
-endif
-
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
-QT5ENGINIO_DEPENDENCIES += qt5declarative
-endif
-
-define QT5ENGINIO_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
-endef
-
-define QT5ENGINIO_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-define QT5ENGINIO_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-	$(QT5_LA_PRL_FILES_FIXUP)
-endef
-
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
-define QT5ENGINIO_INSTALL_TARGET_QMLS
-	cp -dpfr $(STAGING_DIR)/usr/qml/Enginio $(TARGET_DIR)/usr/qml/
-endef
-endif
-
-ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-define QT5ENGINIO_INSTALL_TARGET_EXAMPLES
-	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/enginio $(TARGET_DIR)/usr/lib/qt/examples/
-endef
-endif
-
-ifneq ($(BR2_STATIC_LIBS),y)
-define QT5ENGINIO_INSTALL_TARGET_LIBS
-	cp -dpf $(STAGING_DIR)/usr/lib/libEnginio.so.* $(TARGET_DIR)/usr/lib
-endef
-endif
-
-define QT5ENGINIO_INSTALL_TARGET_CMDS
-	$(QT5ENGINIO_INSTALL_TARGET_LIBS)
-	$(QT5ENGINIO_INSTALL_TARGET_QMLS)
-	$(QT5ENGINIO_INSTALL_TARGET_EXAMPLES)
-endef
-
-$(eval $(generic-package))
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
deleted file mode 100644
index ae29e3b..0000000
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtgraphicaleffects-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e qtgraphicaleffects-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
deleted file mode 100644
index 54b58e4..0000000
--- a/package/qt5/qt5imageformats/qt5imageformats.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtimageformats-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 qtimageformats-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
deleted file mode 100644
index 374952f..0000000
--- a/package/qt5/qt5location/qt5location.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtlocation-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a qtlocation-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
deleted file mode 100644
index 56a11fb..0000000
--- a/package/qt5/qt5multimedia/qt5multimedia.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtmultimedia-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf qtmultimedia-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
deleted file mode 100644
index 6db589d..0000000
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c qtquickcontrols-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
deleted file mode 100644
index 0d85d48..0000000
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols2-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 qtquickcontrols2-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash
deleted file mode 100644
index c8ecb75..0000000
--- a/package/qt5/qt5script/qt5script.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e qtscript-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
deleted file mode 100644
index 65cd127..0000000
--- a/package/qt5/qt5sensors/qt5sensors.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsensors-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 qtsensors-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
deleted file mode 100644
index 308c365..0000000
--- a/package/qt5/qt5serialbus/qt5serialbus.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialbus-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826 qtserialbus-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
deleted file mode 100644
index 2458e5d..0000000
--- a/package/qt5/qt5serialport/qt5serialport.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialport-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 qtserialport-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
deleted file mode 100644
index 0c9e9eb..0000000
--- a/package/qt5/qt5svg/qt5svg.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsvg-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e qtsvg-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
deleted file mode 100644
index cc11b28..0000000
--- a/package/qt5/qt5tools/qt5tools.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
deleted file mode 100644
index 0f9eaae..0000000
--- a/package/qt5/qt5webchannel/qt5webchannel.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebchannel-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 qtwebchannel-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash
deleted file mode 100644
index 96b8bdd..0000000
--- a/package/qt5/qt5webkit/qt5webkit.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# locally computed
-sha256 bdd659573e7e75cd4ad57b7160a7353d98d21a6fef06e4fb9e114a5b1f1e9dab qt5webkit-b35917bcb44d7f200af0f4ac68a126fa0aa8d93d.tar.gz
diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
deleted file mode 100644
index 3443476..0000000
--- a/package/qt5/qt5websockets/qt5websockets.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebsockets-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 qtwebsockets-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
deleted file mode 100644
index 297c578..0000000
--- a/package/qt5/qt5x11extras/qt5x11extras.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced qtx11extras-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
deleted file mode 100644
index fa4e97f..0000000
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtxmlpatterns-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc qtxmlpatterns-opensource-src-5.6.2.tar.xz
-- 
1.9.1

[Buildroot] [PATCH 2/5] Revert "qt5base: install bundled fonts to target"

[Andreas Naumann]

qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645

This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384.

Conflicts:
	package/qt5/qt5base/qt5base.mk

Conflicts:
	package/qt5/qt5base/qt5base.mk

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/qt5/qt5base/qt5base.mk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index f4ca921..e49718e 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -234,13 +234,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
 	fi
 endef
 
-define QT5BASE_INSTALL_TARGET_FONTS
-	if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
-		mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
-		cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
-	fi
-endef
-
 define QT5BASE_INSTALL_TARGET_EXAMPLES
 	if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
 		mkdir -p $(TARGET_DIR)/usr/lib/qt/examples ; \
-- 
1.9.1

[Buildroot] [PATCH 3/5] qt5webkit: bump to 5.8.0-beta

[Andreas Naumann]

Using the 5.8.0-beta version qmake fails because private_tests are not available.
Running qmake a second time makes it compile.

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/qt5/qt5webkit/qt5webkit.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 378cdf7..2489e32 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QT5WEBKIT_VERSION = b35917bcb44d7f200af0f4ac68a126fa0aa8d93d
+QT5WEBKIT_VERSION = 431520f1508e92272171c214b087183e71d08ec5
 # Using GitHub since it supports downloading tarballs from random commits.
 # The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so.
 QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION))
@@ -52,6 +52,7 @@ QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
 define QT5WEBKIT_CONFIGURE_CMDS
 	mkdir -p $(@D)/.git
 	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
 endef
 
 define QT5WEBKIT_BUILD_CMDS
-- 
1.9.1

[Buildroot] [PATCH 4/5] qt5declarative: enable Quick for non-GL platforms

[Andreas Naumann]

However, some modules provide less functionality without OpenGL, so install
steps have to be limited for the softrender only backend:
- qtmultimedia does not provide qml

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/qt5/qt5declarative/Config.in       | 4 +---
 package/qt5/qt5multimedia/qt5multimedia.mk | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index eba4c8d..0604e85 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -14,12 +14,10 @@ config BR2_PACKAGE_QT5DECLARATIVE
 
 if BR2_PACKAGE_QT5DECLARATIVE
 
-comment "quick module needs an OpenGL-capable backend"
+comment "quick module without OpenGL-capable backend will use a less performant software backend"
 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
 
 config BR2_PACKAGE_QT5DECLARATIVE_QUICK
 	bool "quick module"
-	select BR2_PACKAGE_QT5BASE_OPENGL
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
 
 endif
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 67e7968..41eb0f6 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -53,11 +53,13 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y)
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
 define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
 	cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/
 endef
 endif
+endif
 
 define QT5MULTIMEDIA_INSTALL_TARGET_CMDS
 	$(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)
-- 
1.9.1

[Buildroot] [PATCH 5/5] quickcontrols1/2: enable for software renderer

[Andreas Naumann]

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/qt5/qt5quickcontrols/Config.in             | 3 +--
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk   | 5 ++++-
 package/qt5/qt5quickcontrols2/Config.in            | 3 +--
 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 8 +++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
index 0fe8465..d013491 100644
--- a/package/qt5/qt5quickcontrols/Config.in
+++ b/package/qt5/qt5quickcontrols/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
 	bool "qt5quickcontrols"
 	select BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	help
 	  Qt is a cross-platform application and UI framework for
@@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
 
 	  http://qt.io
 
-comment "qt5quickcontrols needs an OpenGL-capable backend"
+comment "Some qt5quickcontrol elements needs an OpenGL-capable backend"
 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index b33ff15..c2946bc 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -31,7 +31,10 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
 endef
 
 define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
-	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
 endef
 
 $(eval $(generic-package))
diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in
index 1e57674..e7271f2 100644
--- a/package/qt5/qt5quickcontrols2/Config.in
+++ b/package/qt5/qt5quickcontrols2/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
 	bool "qt5quickcontrols2"
 	select BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
 	help
 	  Qt is a cross-platform application and UI framework for
@@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
 
 	  http://qt.io
 
-comment "qt5quickcontrols2 needs an OpenGL-capable backend"
+comment "Some qt5quickcontrols2 elements need an OpenGL-capable backend"
 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index a5ad3f6..1a2949c 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -31,10 +31,12 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
 endef
 
 define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
-	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
-	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
-	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
 endef
 
 $(eval $(generic-package))
-- 
1.9.1

[Buildroot] [PATCH 1/5] qt5: bump to 5.8.0-beta

[Arnout Vandecappelle]

On 08-11-16 11:30, Andreas Naumann wrote:
> Removed all hashes (until final release).

 Review would have been easier if you did that in a separate patch.

> 
> - qt5base: renamed library to EglFSDeviceIntegration ([1])
> - qt5base: remove ras-pi patch

 You should mention in the commit message why: (applied upstream).

> - qt5base: remove obsolete config-option -large ([2])

 -largefile, not -large. Also mention explicitly what happened: largefile is not
always enabled.

> - qt5base: make the directfb platform plugin compile ([3])
> - qt53d/quickcontrols2/serialbus: move out of tech-preview

 I didn't see this in your patch?

> - qt5enginio: remove discontinued module

 This should have been done in a separate commit.

> 
> [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ec4eb4db61094179bc6a9ec26ec68fb710177053
> [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108
> [3] Without this patch, qmake is looking for directfb_egl feature which usually is not
>     provided (only by some raspi mkspec afaics).
> 
> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>

[snip]
> diff --git a/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch b/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
> new file mode 100644
> index 0000000..96cc3b0
> --- /dev/null
> +++ b/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
> @@ -0,0 +1,22 @@

 Missing patch description + SoB. Also make it a git-formatted patch.

 For this patch, it is absolutely necessary to get upstream feedback because it
looks very iffy to me.

> +diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
> +index 406b89e..a83b09f 100644
> +--- a/src/plugins/platforms/directfb/directfb.pro
> ++++ b/src/plugins/platforms/directfb/directfb.pro
> +@@ -3,7 +3,7 @@ TARGET = qdirectfb
> + QT += \
> +     core-private gui-private \
> +     eventdispatcher_support-private service_support-private \
> +-    fontdatabase_support-private egl_support-private
> ++    fontdatabase_support-private
> + 
> + QMAKE_USE += directfb
> + 
> +@@ -27,7 +27,7 @@ HEADERS = qdirectfbintegration.h \
> +     qdirectfbeglhooks.h
> + 
> + # ### port the GL context
> +-qtConfig(directfb_egl) {
> ++contains(QT_CONFIG, directfb_egl) {

 Aren't these two equivalent? If this is being built for anything other than
linux-mipsel-broadcom-97425-g++, there is really something weird going on...

 Anyway, to make the patch correct, you should add QT += egl_support-private here.

 Regards,
 Arnout

> +     HEADERS += qdirectfb_egl.h
> +     SOURCES += qdirectfb_egl.cpp
> +     DEFINES += DIRECTFB_GL_EGL



-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 2/5] Revert "qt5base: install bundled fonts to target"

[Arnout Vandecappelle]

On 08-11-16 11:30, Andreas Naumann wrote:
> qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645
> 
> This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384.
> 
> Conflicts:
> 	package/qt5/qt5base/qt5base.mk
> 
> Conflicts:
> 	package/qt5/qt5base/qt5base.mk
> 
> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>

 Remove the Conflicts: lines. Otherwise looks good.

 Regards,
 Arnout

> ---
>  package/qt5/qt5base/qt5base.mk | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index f4ca921..e49718e 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -234,13 +234,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
>  	fi
>  endef
>  
> -define QT5BASE_INSTALL_TARGET_FONTS
> -	if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
> -		mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
> -		cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
> -	fi
> -endef
> -
>  define QT5BASE_INSTALL_TARGET_EXAMPLES
>  	if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
>  		mkdir -p $(TARGET_DIR)/usr/lib/qt/examples ; \
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 3/5] qt5webkit: bump to 5.8.0-beta

[Arnout Vandecappelle]

On 08-11-16 11:30, Andreas Naumann wrote:
> Using the 5.8.0-beta version qmake fails because private_tests are not available.
> Running qmake a second time makes it compile.

 Have you reported this upstream?

 Regards,
 Arnout

> 
> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
> ---
>  package/qt5/qt5webkit/qt5webkit.mk | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
> index 378cdf7..2489e32 100644
> --- a/package/qt5/qt5webkit/qt5webkit.mk
> +++ b/package/qt5/qt5webkit/qt5webkit.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -QT5WEBKIT_VERSION = b35917bcb44d7f200af0f4ac68a126fa0aa8d93d
> +QT5WEBKIT_VERSION = 431520f1508e92272171c214b087183e71d08ec5
>  # Using GitHub since it supports downloading tarballs from random commits.
>  # The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so.
>  QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION))
> @@ -52,6 +52,7 @@ QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
>  define QT5WEBKIT_CONFIGURE_CMDS
>  	mkdir -p $(@D)/.git
>  	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
> +	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
>  endef
>  
>  define QT5WEBKIT_BUILD_CMDS
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 4/5] qt5declarative: enable Quick for non-GL platforms

[Arnout Vandecappelle]

On 08-11-16 11:30, Andreas Naumann wrote:
> However, some modules provide less functionality without OpenGL, so install
> steps have to be limited for the softrender only backend:
> - qtmultimedia does not provide qml
> 
> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
> ---
>  package/qt5/qt5declarative/Config.in       | 4 +---
>  package/qt5/qt5multimedia/qt5multimedia.mk | 2 ++
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
> index eba4c8d..0604e85 100644
> --- a/package/qt5/qt5declarative/Config.in
> +++ b/package/qt5/qt5declarative/Config.in
> @@ -14,12 +14,10 @@ config BR2_PACKAGE_QT5DECLARATIVE
>  
>  if BR2_PACKAGE_QT5DECLARATIVE
>  
> -comment "quick module needs an OpenGL-capable backend"
> +comment "quick module without OpenGL-capable backend will use a less performant software backend"

 I think this comment can just be removed.

>  	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
>  
>  config BR2_PACKAGE_QT5DECLARATIVE_QUICK
>  	bool "quick module"
> -	select BR2_PACKAGE_QT5BASE_OPENGL
> -	depends on BR2_PACKAGE_QT5_GL_AVAILABLE

 Shouldn't this be
	select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE
? We really want to use opengl if we can...

>  
>  endif
> diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
> index 67e7968..41eb0f6 100644
> --- a/package/qt5/qt5multimedia/qt5multimedia.mk
> +++ b/package/qt5/qt5multimedia/qt5multimedia.mk
> @@ -53,11 +53,13 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
>  endef
>  endif
>  
> +ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y)

 Add a comment here to explain why, it looks a bit strange.

 Regards,
 Arnout

>  ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
>  define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
>  	cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/
>  endef
>  endif
> +endif
>  
>  define QT5MULTIMEDIA_INSTALL_TARGET_CMDS
>  	$(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 5/5] quickcontrols1/2: enable for software renderer

[Arnout Vandecappelle]

On 08-11-16 11:30, Andreas Naumann wrote:
> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
> ---
>  package/qt5/qt5quickcontrols/Config.in             | 3 +--
>  package/qt5/qt5quickcontrols/qt5quickcontrols.mk   | 5 ++++-
>  package/qt5/qt5quickcontrols2/Config.in            | 3 +--
>  package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 8 +++++---
>  4 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
> index 0fe8465..d013491 100644
> --- a/package/qt5/qt5quickcontrols/Config.in
> +++ b/package/qt5/qt5quickcontrols/Config.in
> @@ -2,7 +2,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
>  	bool "qt5quickcontrols"
>  	select BR2_PACKAGE_QT5DECLARATIVE
>  	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
> -	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
>  	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
>  	help
>  	  Qt is a cross-platform application and UI framework for
> @@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
>  
>  	  http://qt.io
>  
> -comment "qt5quickcontrols needs an OpenGL-capable backend"
> +comment "Some qt5quickcontrol elements needs an OpenGL-capable backend"

 Hm, a bit vague. I think the comment can be removed.

>  	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
>  	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
> diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
> index b33ff15..c2946bc 100644
> --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
> +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
> @@ -31,7 +31,10 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
>  endef
>  
>  define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
> -	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick

 Why?


 Regards,
 Arnout

>  endef
>  
>  $(eval $(generic-package))
> diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in
> index 1e57674..e7271f2 100644
> --- a/package/qt5/qt5quickcontrols2/Config.in
> +++ b/package/qt5/qt5quickcontrols2/Config.in
> @@ -2,7 +2,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
>  	bool "qt5quickcontrols2"
>  	select BR2_PACKAGE_QT5DECLARATIVE
>  	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
> -	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
>  	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
>  	help
>  	  Qt is a cross-platform application and UI framework for
> @@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
>  
>  	  http://qt.io
>  
> -comment "qt5quickcontrols2 needs an OpenGL-capable backend"
> +comment "Some qt5quickcontrols2 elements need an OpenGL-capable backend"
>  	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
>  	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
> diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
> index a5ad3f6..1a2949c 100644
> --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
> +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
> @@ -31,10 +31,12 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
>  endef
>  
>  define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
> -	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
> -	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
> +	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
> +	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
>  	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
> -	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
> +	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick
> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
>  endef
>  
>  $(eval $(generic-package))
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 0/5] Bump QT 5.8.0-beta

[Arnout Vandecappelle]

On 08-11-16 11:30, Andreas Naumann wrote:
> I'm currently playing around with qt5.8 and might as well ask for comments.
> 
> I've done some testing on IMX6 and SAMA5D3 and things seem to do fine, 
> especially GPU-less QML which is motivation for this.
> Compile only tested with a ras-pi defconfig.
> 
> This series removes the hashes for now since they will change again anyway.

 I've done a super-quick review.

 I've marked the series as Rejected in patchwork, since it's not intended to be
included.

 Regards,
 Arnout

> 
> 
> Andreas Naumann (5):
>   qt5: bump to 5.8.0-beta
>   Revert "qt5base: install bundled fonts to target"
>   qt5webkit: bump to 5.8.0-beta
>   qt5declarative: enable Quick for non-GL platforms
>   quickcontrols1/2: enable for software renderer
> 
>  package/qt5/Config.in                              |  7 +--
>  package/qt5/qt5.mk                                 |  6 +-
>  package/qt5/qt53d/qt53d.hash                       |  2 -
>  ...001-directfb-make-platform-plugin-compile.patch | 22 ++++++++
>  .../0006-eglfs-rasp-pi-header-inclusion.patch      | 45 ---------------
>  package/qt5/qt5base/qt5base.hash                   |  2 -
>  package/qt5/qt5base/qt5base.mk                     | 11 +---
>  package/qt5/qt5canvas3d/qt5canvas3d.hash           |  2 -
>  package/qt5/qt5connectivity/qt5connectivity.hash   |  2 -
>  package/qt5/qt5declarative/Config.in               |  4 +-
>  package/qt5/qt5declarative/qt5declarative.hash     |  2 -
>  package/qt5/qt5enginio/Config.in                   | 13 -----
>  package/qt5/qt5enginio/qt5enginio.hash             |  2 -
>  package/qt5/qt5enginio/qt5enginio.mk               | 64 ----------------------
>  .../qt5graphicaleffects/qt5graphicaleffects.hash   |  2 -
>  package/qt5/qt5imageformats/qt5imageformats.hash   |  2 -
>  package/qt5/qt5location/qt5location.hash           |  2 -
>  package/qt5/qt5multimedia/qt5multimedia.hash       |  2 -
>  package/qt5/qt5multimedia/qt5multimedia.mk         |  2 +
>  package/qt5/qt5quickcontrols/Config.in             |  3 +-
>  package/qt5/qt5quickcontrols/qt5quickcontrols.hash |  2 -
>  package/qt5/qt5quickcontrols/qt5quickcontrols.mk   |  5 +-
>  package/qt5/qt5quickcontrols2/Config.in            |  3 +-
>  .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  2 -
>  package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk |  8 ++-
>  package/qt5/qt5script/qt5script.hash               |  2 -
>  package/qt5/qt5sensors/qt5sensors.hash             |  2 -
>  package/qt5/qt5serialbus/qt5serialbus.hash         |  2 -
>  package/qt5/qt5serialport/qt5serialport.hash       |  2 -
>  package/qt5/qt5svg/qt5svg.hash                     |  2 -
>  package/qt5/qt5tools/qt5tools.hash                 |  2 -
>  package/qt5/qt5webchannel/qt5webchannel.hash       |  2 -
>  package/qt5/qt5webkit/qt5webkit.hash               |  2 -
>  package/qt5/qt5webkit/qt5webkit.mk                 |  3 +-
>  package/qt5/qt5websockets/qt5websockets.hash       |  2 -
>  package/qt5/qt5x11extras/qt5x11extras.hash         |  2 -
>  package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |  2 -
>  37 files changed, 45 insertions(+), 197 deletions(-)
>  delete mode 100644 package/qt5/qt53d/qt53d.hash
>  create mode 100644 package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
>  delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
>  delete mode 100644 package/qt5/qt5base/qt5base.hash
>  delete mode 100644 package/qt5/qt5canvas3d/qt5canvas3d.hash
>  delete mode 100644 package/qt5/qt5connectivity/qt5connectivity.hash
>  delete mode 100644 package/qt5/qt5declarative/qt5declarative.hash
>  delete mode 100644 package/qt5/qt5enginio/Config.in
>  delete mode 100644 package/qt5/qt5enginio/qt5enginio.hash
>  delete mode 100644 package/qt5/qt5enginio/qt5enginio.mk
>  delete mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
>  delete mode 100644 package/qt5/qt5imageformats/qt5imageformats.hash
>  delete mode 100644 package/qt5/qt5location/qt5location.hash
>  delete mode 100644 package/qt5/qt5multimedia/qt5multimedia.hash
>  delete mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.hash
>  delete mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
>  delete mode 100644 package/qt5/qt5script/qt5script.hash
>  delete mode 100644 package/qt5/qt5sensors/qt5sensors.hash
>  delete mode 100644 package/qt5/qt5serialbus/qt5serialbus.hash
>  delete mode 100644 package/qt5/qt5serialport/qt5serialport.hash
>  delete mode 100644 package/qt5/qt5svg/qt5svg.hash
>  delete mode 100644 package/qt5/qt5tools/qt5tools.hash
>  delete mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash
>  delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash
>  delete mode 100644 package/qt5/qt5websockets/qt5websockets.hash
>  delete mode 100644 package/qt5/qt5x11extras/qt5x11extras.hash
>  delete mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH 5/5] quickcontrols1/2: enable for software renderer

[Andreas Naumann]

Am 08.11.2016 um 23:56 schrieb Arnout Vandecappelle:
>
>
> On 08-11-16 11:30, Andreas Naumann wrote:
>> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
>> ---
>>  package/qt5/qt5quickcontrols/Config.in             | 3 +--
>>  package/qt5/qt5quickcontrols/qt5quickcontrols.mk   | 5 ++++-
>>  package/qt5/qt5quickcontrols2/Config.in            | 3 +--
>>  package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 8 +++++---
>>  4 files changed, 11 insertions(+), 8 deletions(-)
>>
>> diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
>> index 0fe8465..d013491 100644
>> --- a/package/qt5/qt5quickcontrols/Config.in
>> +++ b/package/qt5/qt5quickcontrols/Config.in
>> @@ -2,7 +2,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
>>  	bool "qt5quickcontrols"
>>  	select BR2_PACKAGE_QT5DECLARATIVE
>>  	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
>> -	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
>>  	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
>>  	help
>>  	  Qt is a cross-platform application and UI framework for
>> @@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
>>
>>  	  http://qt.io
>>
>> -comment "qt5quickcontrols needs an OpenGL-capable backend"
>> +comment "Some qt5quickcontrol elements needs an OpenGL-capable backend"
>
>  Hm, a bit vague. I think the comment can be removed.

ok

>
>>  	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
>>  	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
>> diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
>> index b33ff15..c2946bc 100644
>> --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
>> +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
>> @@ -31,7 +31,10 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
>>  endef
>>
>>  define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
>> -	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
>> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
>> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
>> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
>> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
>
>  Why?

QuickControls provides different subfolders than QuickControls2 under 
/usr/qml/QtQuick. Explicitely listing them avoids sometimes undesirable 
stuff getting installed when repeatedly building.
Ok, this may better go in another patch.

>
>
>  Regards,
>  Arnout
>
>>  endef
>>
>>  $(eval $(generic-package))
>> diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in
>> index 1e57674..e7271f2 100644
>> --- a/package/qt5/qt5quickcontrols2/Config.in
>> +++ b/package/qt5/qt5quickcontrols2/Config.in
>> @@ -2,7 +2,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
>>  	bool "qt5quickcontrols2"
>>  	select BR2_PACKAGE_QT5DECLARATIVE
>>  	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
>> -	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
>>  	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
>>  	help
>>  	  Qt is a cross-platform application and UI framework for
>> @@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
>>
>>  	  http://qt.io
>>
>> -comment "qt5quickcontrols2 needs an OpenGL-capable backend"
>> +comment "Some qt5quickcontrols2 elements need an OpenGL-capable backend"
>>  	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
>>  	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
>> diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
>> index a5ad3f6..1a2949c 100644
>> --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
>> +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
>> @@ -31,10 +31,12 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
>>  endef
>>
>>  define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
>> -	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
>> -	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
>> +	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
>> +	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
>>  	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
>> -	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
>> +	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
>> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick
>> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
>>  endef
>>
>>  $(eval $(generic-package))
>>
>

[Buildroot] [PATCH 4/5] qt5declarative: enable Quick for non-GL platforms

[Andreas Naumann]

Am 08.11.2016 um 23:53 schrieb Arnout Vandecappelle:
>
>
> On 08-11-16 11:30, Andreas Naumann wrote:
>> However, some modules provide less functionality without OpenGL, so install
>> steps have to be limited for the softrender only backend:
>> - qtmultimedia does not provide qml
>>
>> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
>> ---
>>  package/qt5/qt5declarative/Config.in       | 4 +---
>>  package/qt5/qt5multimedia/qt5multimedia.mk | 2 ++
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
>> index eba4c8d..0604e85 100644
>> --- a/package/qt5/qt5declarative/Config.in
>> +++ b/package/qt5/qt5declarative/Config.in
>> @@ -14,12 +14,10 @@ config BR2_PACKAGE_QT5DECLARATIVE
>>
>>  if BR2_PACKAGE_QT5DECLARATIVE
>>
>> -comment "quick module needs an OpenGL-capable backend"
>> +comment "quick module without OpenGL-capable backend will use a less performant software backend"
>
>  I think this comment can just be removed.

ok

>
>>  	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
>>
>>  config BR2_PACKAGE_QT5DECLARATIVE_QUICK
>>  	bool "quick module"
>> -	select BR2_PACKAGE_QT5BASE_OPENGL
>> -	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
>
>  Shouldn't this be
> 	select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE
> ? We really want to use opengl if we can...

yes

>
>>
>>  endif
>> diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
>> index 67e7968..41eb0f6 100644
>> --- a/package/qt5/qt5multimedia/qt5multimedia.mk
>> +++ b/package/qt5/qt5multimedia/qt5multimedia.mk
>> @@ -53,11 +53,13 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
>>  endef
>>  endif
>>
>> +ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y)
>
>  Add a comment here to explain why, it looks a bit strange.

ok. its due to QtMultimedia still requiring OpenGL, so qt is smart 
enough to not compile it -> cant be installed.

>
>  Regards,
>  Arnout
>
>>  ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
>>  define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
>>  	cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/
>>  endef
>>  endif
>> +endif
>>
>>  define QT5MULTIMEDIA_INSTALL_TARGET_CMDS
>>  	$(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)
>>
>

[Buildroot] [PATCH 1/5] qt5: bump to 5.8.0-beta

[Andreas Naumann]

Am 08.11.2016 um 23:50 schrieb Arnout Vandecappelle:
>
>
> On 08-11-16 11:30, Andreas Naumann wrote:
>> Removed all hashes (until final release).
>
>  Review would have been easier if you did that in a separate patch.

ok
>
>>
>> - qt5base: renamed library to EglFSDeviceIntegration ([1])
>> - qt5base: remove ras-pi patch
>
>  You should mention in the commit message why: (applied upstream).

Well in fact, I dont know why. I've tried a reworked patch and ommiting 
it. Both compiled just fine (with eglfs), so I went with the simpler 
solution :-).
An assumption would be the change in library handling in configure 
(qtbase c0cc5052097c723d0331a7619d686af9eb93d33c). Maybe Julien, who 
originally submitted the patch, can shed some light on this.


>
>> - qt5base: remove obsolete config-option -large ([2])
>
>  -largefile, not -large. Also mention explicitly what happened: largefile is not
> always enabled.

ok (largefile is now always on and no longer configurable)
>
>> - qt5base: make the directfb platform plugin compile ([3])
>> - qt53d/quickcontrols2/serialbus: move out of tech-preview
>
>  I didn't see this in your patch?

just moved the position in Config.in

>
>> - qt5enginio: remove discontinued module
>
>  This should have been done in a separate commit.
>

ok

>>
>> [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ec4eb4db61094179bc6a9ec26ec68fb710177053
>> [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108
>> [3] Without this patch, qmake is looking for directfb_egl feature which usually is not
>>     provided (only by some raspi mkspec afaics).
>>
>> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
>
> [snip]
>> diff --git a/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch b/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
>> new file mode 100644
>> index 0000000..96cc3b0
>> --- /dev/null
>> +++ b/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
>> @@ -0,0 +1,22 @@
>
>  Missing patch description + SoB. Also make it a git-formatted patch.
>
>  For this patch, it is absolutely necessary to get upstream feedback because it
> looks very iffy to me.

iffy indeed. After a second look, maybe the new feature system doesnt 
know directfb_egl at all. Will report upstream.

>
>> +diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
>> +index 406b89e..a83b09f 100644
>> +--- a/src/plugins/platforms/directfb/directfb.pro
>> ++++ b/src/plugins/platforms/directfb/directfb.pro
>> +@@ -3,7 +3,7 @@ TARGET = qdirectfb:q
>> + QT += \
>> +     core-private gui-private \
>> +     eventdispatcher_support-private service_support-private \
>> +-    fontdatabase_support-private egl_support-private
>> ++    fontdatabase_support-private
>> +
>> + QMAKE_USE += directfb
>> +
>> +@@ -27,7 +27,7 @@ HEADERS = qdirectfbintegration.h \
>> +     qdirectfbeglhooks.h
>> +
>> + # ### port the GL context
>> +-qtConfig(directfb_egl) {
>> ++contains(QT_CONFIG, directfb_egl) {
>
>  Aren't these two equivalent? If this is being built for anything other than
> linux-mipsel-broadcom-97425-g++, there is really something weird going on...
>
>  Anyway, to make the patch correct, you should add QT += egl_support-private here.
>
>  Regards,
>  Arnout
>
>> +     HEADERS += qdirectfb_egl.h
>> +     SOURCES += qdirectfb_egl.cpp
>> +     DEFINES += DIRECTFB_GL_EGL
>
>
>

[Buildroot] [PATCH 3/5] qt5webkit: bump to 5.8.0-beta

[Andreas Naumann]

Am 08.11.2016 um 23:51 schrieb Arnout Vandecappelle:
>
>
> On 08-11-16 11:30, Andreas Naumann wrote:
>> Using the 5.8.0-beta version qmake fails because private_tests are not available.
>> Running qmake a second time makes it compile.
>
>  Have you reported this upstream?

no, will do

>
>  Regards,
>  Arnout
>
>>
>> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
>> ---
>>  package/qt5/qt5webkit/qt5webkit.mk | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
>> index 378cdf7..2489e32 100644
>> --- a/package/qt5/qt5webkit/qt5webkit.mk
>> +++ b/package/qt5/qt5webkit/qt5webkit.mk
>> @@ -4,7 +4,7 @@
>>  #
>>  ################################################################################
>>
>> -QT5WEBKIT_VERSION = b35917bcb44d7f200af0f4ac68a126fa0aa8d93d
>> +QT5WEBKIT_VERSION = 431520f1508e92272171c214b087183e71d08ec5
>>  # Using GitHub since it supports downloading tarballs from random commits.
>>  # The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so.
>>  QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION))
>> @@ -52,6 +52,7 @@ QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
>>  define QT5WEBKIT_CONFIGURE_CMDS
>>  	mkdir -p $(@D)/.git
>>  	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
>> +	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
>>  endef
>>
>>  define QT5WEBKIT_BUILD_CMDS
>>
>

[Buildroot] [PATCH 0/5] Bump QT 5.8.0-beta

[Andreas Naumann]

Am 08.11.2016 um 23:57 schrieb Arnout Vandecappelle:
>
>
> On 08-11-16 11:30, Andreas Naumann wrote:
>> I'm currently playing around with qt5.8 and might as well ask for comments.
>>
>> I've done some testing on IMX6 and SAMA5D3 and things seem to do fine,
>> especially GPU-less QML which is motivation for this.
>> Compile only tested with a ras-pi defconfig.
>>
>> This series removes the hashes for now since they will change again anyway.
>
>  I've done a super-quick review.
>
>  I've marked the series as Rejected in patchwork, since it's not intended to be
> included.
>
>  Regards,
>  Arnout

Thanks for the review, I'll rework the set and try to get upstream 
feedback on the strange issues.

Regards,
Andreas

>
>>
>>
>> Andreas Naumann (5):
>>   qt5: bump to 5.8.0-beta
>>   Revert "qt5base: install bundled fonts to target"
>>   qt5webkit: bump to 5.8.0-beta
>>   qt5declarative: enable Quick for non-GL platforms
>>   quickcontrols1/2: enable for software renderer
>>
>>  package/qt5/Config.in                              |  7 +--
>>  package/qt5/qt5.mk                                 |  6 +-
>>  package/qt5/qt53d/qt53d.hash                       |  2 -
>>  ...001-directfb-make-platform-plugin-compile.patch | 22 ++++++++
>>  .../0006-eglfs-rasp-pi-header-inclusion.patch      | 45 ---------------
>>  package/qt5/qt5base/qt5base.hash                   |  2 -
>>  package/qt5/qt5base/qt5base.mk                     | 11 +---
>>  package/qt5/qt5canvas3d/qt5canvas3d.hash           |  2 -
>>  package/qt5/qt5connectivity/qt5connectivity.hash   |  2 -
>>  package/qt5/qt5declarative/Config.in               |  4 +-
>>  package/qt5/qt5declarative/qt5declarative.hash     |  2 -
>>  package/qt5/qt5enginio/Config.in                   | 13 -----
>>  package/qt5/qt5enginio/qt5enginio.hash             |  2 -
>>  package/qt5/qt5enginio/qt5enginio.mk               | 64 ----------------------
>>  .../qt5graphicaleffects/qt5graphicaleffects.hash   |  2 -
>>  package/qt5/qt5imageformats/qt5imageformats.hash   |  2 -
>>  package/qt5/qt5location/qt5location.hash           |  2 -
>>  package/qt5/qt5multimedia/qt5multimedia.hash       |  2 -
>>  package/qt5/qt5multimedia/qt5multimedia.mk         |  2 +
>>  package/qt5/qt5quickcontrols/Config.in             |  3 +-
>>  package/qt5/qt5quickcontrols/qt5quickcontrols.hash |  2 -
>>  package/qt5/qt5quickcontrols/qt5quickcontrols.mk   |  5 +-
>>  package/qt5/qt5quickcontrols2/Config.in            |  3 +-
>>  .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  2 -
>>  package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk |  8 ++-
>>  package/qt5/qt5script/qt5script.hash               |  2 -
>>  package/qt5/qt5sensors/qt5sensors.hash             |  2 -
>>  package/qt5/qt5serialbus/qt5serialbus.hash         |  2 -
>>  package/qt5/qt5serialport/qt5serialport.hash       |  2 -
>>  package/qt5/qt5svg/qt5svg.hash                     |  2 -
>>  package/qt5/qt5tools/qt5tools.hash                 |  2 -
>>  package/qt5/qt5webchannel/qt5webchannel.hash       |  2 -
>>  package/qt5/qt5webkit/qt5webkit.hash               |  2 -
>>  package/qt5/qt5webkit/qt5webkit.mk                 |  3 +-
>>  package/qt5/qt5websockets/qt5websockets.hash       |  2 -
>>  package/qt5/qt5x11extras/qt5x11extras.hash         |  2 -
>>  package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |  2 -
>>  37 files changed, 45 insertions(+), 197 deletions(-)
>>  delete mode 100644 package/qt5/qt53d/qt53d.hash
>>  create mode 100644 package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
>>  delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
>>  delete mode 100644 package/qt5/qt5base/qt5base.hash
>>  delete mode 100644 package/qt5/qt5canvas3d/qt5canvas3d.hash
>>  delete mode 100644 package/qt5/qt5connectivity/qt5connectivity.hash
>>  delete mode 100644 package/qt5/qt5declarative/qt5declarative.hash
>>  delete mode 100644 package/qt5/qt5enginio/Config.in
>>  delete mode 100644 package/qt5/qt5enginio/qt5enginio.hash
>>  delete mode 100644 package/qt5/qt5enginio/qt5enginio.mk
>>  delete mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
>>  delete mode 100644 package/qt5/qt5imageformats/qt5imageformats.hash
>>  delete mode 100644 package/qt5/qt5location/qt5location.hash
>>  delete mode 100644 package/qt5/qt5multimedia/qt5multimedia.hash
>>  delete mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.hash
>>  delete mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
>>  delete mode 100644 package/qt5/qt5script/qt5script.hash
>>  delete mode 100644 package/qt5/qt5sensors/qt5sensors.hash
>>  delete mode 100644 package/qt5/qt5serialbus/qt5serialbus.hash
>>  delete mode 100644 package/qt5/qt5serialport/qt5serialport.hash
>>  delete mode 100644 package/qt5/qt5svg/qt5svg.hash
>>  delete mode 100644 package/qt5/qt5tools/qt5tools.hash
>>  delete mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash
>>  delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash
>>  delete mode 100644 package/qt5/qt5websockets/qt5websockets.hash
>>  delete mode 100644 package/qt5/qt5x11extras/qt5x11extras.hash
>>  delete mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
>>
>

[Buildroot] [PATCH 1/5] qt5: bump to 5.8.0-beta

[Julien CORJON]

Andreas,

Also, super-quick review...

Le 08/11/2016 ? 11:30, Andreas Naumann a ?crit :
> Removed all hashes (until final release).

As Arnout said, please do this in a first commit

> - qt5base: renamed library to EglFSDeviceIntegration ([1])
> - qt5base: remove ras-pi patch

> - qt5base: remove obsolete config-option -large ([2])
> - qt5base: make the directfb platform plugin compile ([3])
> - qt53d/quickcontrols2/serialbus: move out of tech-preview

Please keep the names qt5* : qt53d/qt5quickcontrol2/qt5serialbus

> - qt5enginio: remove discontinued module

Qt5Engino is still kept in the repository (as Qt5Webkit) : 
http://download.qt.io/snapshots/qt/5.8/5.8.0-beta/latest_src/submodules/qtenginio-opensource-src-1.6.2.tar.xz

> diff --git a/package/qt5/Config.in b/package/qt5/Config.in
> index 234dfdd..a4dc481 100644
> --- a/package/qt5/Config.in
> +++ b/package/qt5/Config.in

Qt5 need C++11 support since 5.7, you should have
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 in the menuconfig and 
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 in comment section.

See https://wiki.qt.io/New_Features_in_Qt_5.7

> @@ -31,16 +31,18 @@ menuconfig BR2_PACKAGE_QT5
>
>  if BR2_PACKAGE_QT5
>  source "package/qt5/qt5base/Config.in"
> +source "package/qt5/qt53d/Config.in"
>  source "package/qt5/qt5canvas3d/Config.in"
>  source "package/qt5/qt5connectivity/Config.in"
>  source "package/qt5/qt5declarative/Config.in"
> -source "package/qt5/qt5enginio/Config.in"

Please move qt5enginio in legacy compatibility section

>  source "package/qt5/qt5graphicaleffects/Config.in"
>  source "package/qt5/qt5imageformats/Config.in"
>  source "package/qt5/qt5location/Config.in"
>  source "package/qt5/qt5multimedia/Config.in"
>  source "package/qt5/qt5quickcontrols/Config.in"
> +source "package/qt5/qt5quickcontrols2/Config.in"
>  source "package/qt5/qt5sensors/Config.in"
> +source "package/qt5/qt5serialbus/Config.in"
>  source "package/qt5/qt5serialport/Config.in"
>  source "package/qt5/qt5svg/Config.in"
>  source "package/qt5/qt5tools/Config.in"
> @@ -49,9 +51,6 @@ source "package/qt5/qt5websockets/Config.in"
>  source "package/qt5/qt5x11extras/Config.in"
>  source "package/qt5/qt5xmlpatterns/Config.in"
>  comment "technology preview"
> -source "package/qt5/qt53d/Config.in"
> -source "package/qt5/qt5quickcontrols2/Config.in"
> -source "package/qt5/qt5serialbus/Config.in"
>  comment "legacy compatibility"
>  source "package/qt5/qt5script/Config.in"
>  source "package/qt5/qt5webkit/Config.in"

> diff --git a/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch b/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch

Sames comment as Arnout. Also, please include the link of bug report in 
the commit message.

> diff --git a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
> deleted file mode 100644
> index f1f6d9b..0000000
> --- a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001
> -From: Julien Corjon <corjon.j@ecagroup.com>
> -Date: Tue, 21 Jul 2015 09:58:14 +0200
> -Subject: [PATCH] eglfs - fix rasp-pi header inclusion
> -
> -eglplateform.h include headers for low level instruction and fail on brcm
> -headers inclusion
> -  For the brcm presence test we use egl pkg-config file
> -  For the eglfs-plugin compilation we use the egl configuration
> -
> -Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339
> -Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>

You're right, commit c0cc5052097c723d0331a7619d686af9eb93d33c in qt5base 
fix this bug. Please add this in comment.

At the end Qt5.7 drop LGPLv2.1. There is probably some adjustement in 
all mk files. See : http://blog.qt.io/blog/2016/06/16/qt-5-7-released/

Regards,

Julien

[Buildroot] [Rejected v2 0/7] qt5 bump to 5.8.0-beta

[Julien Corjon]

As I'm, also, working on qt5.8 next bump i made a V2 of Andreas
series and include a proposed patch from Alexey for convinience.

I mostly work on patch 2/7 to include qtwebkit fix and add C++11
requirement.
Patches 6 & 7 are not touched (did not take Arnout comment yet).

Of course as it's a beta version this series is to reject in
patchwork. But if someone what to give a try on it, comments are
more than welcome.


Alexey Brodkin (1):
  qt5webkit: Get sources from Qt-5-unofficial-builds

Julien Corjon (2):
  qt5enginio : move into legacy compatibility
  qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview

Naumann Andreas (4):
  qt5: bump to 5.8.0-beta
  Revert "qt5base: install bundled fonts to target"
  qt5declarative: enable Quick for non-GL platforms
  quickcontrols1/2: enable for software renderer

 package/qt5/Config.in                              | 14 +++----
 package/qt5/qt5.mk                                 |  7 ++--
 package/qt5/qt53d/qt53d.hash                       |  4 +-
 ...001-directfb-make-platform-plugin-compile.patch | 22 +++++++++++
 .../0006-eglfs-rasp-pi-header-inclusion.patch      | 45 ----------------------
 package/qt5/qt5base/qt5base.hash                   |  4 +-
 package/qt5/qt5base/qt5base.mk                     | 11 +-----
 package/qt5/qt5canvas3d/qt5canvas3d.hash           |  4 +-
 package/qt5/qt5connectivity/qt5connectivity.hash   |  4 +-
 package/qt5/qt5declarative/Config.in               |  4 +-
 package/qt5/qt5declarative/qt5declarative.hash     |  4 +-
 package/qt5/qt5enginio/qt5enginio.hash             |  4 +-
 .../qt5graphicaleffects/qt5graphicaleffects.hash   |  4 +-
 package/qt5/qt5imageformats/qt5imageformats.hash   |  4 +-
 package/qt5/qt5location/qt5location.hash           |  4 +-
 package/qt5/qt5multimedia/qt5multimedia.hash       |  4 +-
 package/qt5/qt5multimedia/qt5multimedia.mk         |  2 +
 package/qt5/qt5quickcontrols/Config.in             |  3 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.hash |  4 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk   |  5 ++-
 package/qt5/qt5quickcontrols2/Config.in            |  3 +-
 .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  4 +-
 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk |  8 ++--
 package/qt5/qt5script/qt5script.hash               |  4 +-
 package/qt5/qt5sensors/qt5sensors.hash             |  4 +-
 package/qt5/qt5serialbus/qt5serialbus.hash         |  4 +-
 package/qt5/qt5serialport/qt5serialport.hash       |  4 +-
 package/qt5/qt5svg/qt5svg.hash                     |  4 +-
 package/qt5/qt5tools/qt5tools.hash                 |  4 +-
 package/qt5/qt5webchannel/qt5webchannel.hash       |  4 +-
 ...004-Remove-unused-check-for-private_tests.patch | 40 +++++++++++++++++++
 package/qt5/qt5webkit/qt5webkit.hash               |  4 +-
 package/qt5/qt5webkit/qt5webkit.mk                 | 14 ++-----
 package/qt5/qt5websockets/qt5websockets.hash       |  4 +-
 package/qt5/qt5x11extras/qt5x11extras.hash         |  4 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |  4 +-
 36 files changed, 137 insertions(+), 133 deletions(-)
 create mode 100644 package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
 delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
 create mode 100644 package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch

-- 
2.9.3

[Buildroot] [Rejected v2 1/7] qt5webkit: Get sources from Qt-5-unofficial-builds

[Julien Corjon]

Instead of messing with git we may get tarballs of obsolete but still
existing submodules as we used to but from a bit different location.

It turned out Qt people still create packages for obsolete submodules
for so-called "unofficial builds", see [1].

[1] https://wiki.qt.io/Qt-5-unofficial-builds

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
---
 package/qt5/qt5.mk                   |  1 +
 package/qt5/qt5webkit/qt5webkit.hash |  4 ++--
 package/qt5/qt5webkit/qt5webkit.mk   | 14 +++-----------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index d25f663..e937e23 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,6 +1,7 @@
 QT5_VERSION_MAJOR = 5.6
 QT5_VERSION = $(QT5_VERSION_MAJOR).2
 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
+QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
 include $(sort $(wildcard package/qt5/*/*.mk))
 
 define QT5_LA_PRL_FILES_FIXUP
diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash
index 96b8bdd..309f776 100644
--- a/package/qt5/qt5webkit/qt5webkit.hash
+++ b/package/qt5/qt5webkit/qt5webkit.hash
@@ -1,2 +1,2 @@
-# locally computed
-sha256 bdd659573e7e75cd4ad57b7160a7353d98d21a6fef06e4fb9e114a5b1f1e9dab qt5webkit-b35917bcb44d7f200af0f4ac68a126fa0aa8d93d.tar.gz
+# Hash from: http://download.qt.io/snapshots/qt/5.6/5.6.2/latest_src/submodules/qtwebkit-opensource-src-5.6.2.tar.xz.mirrorlist
+sha256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 qtwebkit-opensource-src-5.6.2.tar.xz
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 378cdf7..980d2af 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-QT5WEBKIT_VERSION = b35917bcb44d7f200af0f4ac68a126fa0aa8d93d
-# Using GitHub since it supports downloading tarballs from random commits.
-# The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so.
-QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION))
+QT5WEBKIT_VERSION = $(QT5_VERSION)
+QT5WEBKIT_SITE = $(QT5_SNAPSHOTS_SITE)
+QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
 QT5WEBKIT_DEPENDENCIES = \
 	host-bison host-flex host-gperf host-python host-ruby \
 	qt5base sqlite
@@ -43,14 +42,7 @@ define QT5WEBKIT_PYTHON2_SYMLINK
 endef
 QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
 
-# Since we get the source from git, generated header files are not included.
-# qmake detects that header file generation (using the syncqt tool) must be
-# done based on the existence of a .git directory (cfr. the git_build config
-# option which is set in qt_build_paths.prf).
-# So, to make sure that qmake detects that header files must be generated,
-# create an empty .git directory.
 define QT5WEBKIT_CONFIGURE_CMDS
-	mkdir -p $(@D)/.git
 	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
 endef
 
-- 
2.9.3

[Buildroot] [Rejected v2 2/2] qt5: bump to 5.8.0-beta

[Julien Corjon]

- qt5 need C++11 compliant compiler since 5.7 ([1])
- qt5base: renamed library to EglFSDeviceIntegration ([2])
- qt5base: remove ras-pi patch, commit c0cc5052097c723d0331a7619d686af9eb93d33c fix it ([3])
- qt5base: remove obsolete config-option -large ([4])
- qt5base: make the directfb platform plugin compile ([5])
- qt5webkit : add 0004-Remove-unused-check-for-private_tests.patch ([6])

[1] http://blog.qt.io/blog/2016/06/16/qt-5-7-released/
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ec4eb4db61094179bc6a9ec26ec68fb710177053
[3] https://codereview.qt-project.org/#/c/167172/
[4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108
[5] https://bugreports.qt.io/browse/QTBUG-57039
[6] https://bugreports.qt.io/browse/QTBUG-55950

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
---
 package/qt5/Config.in                              |  5 ++-
 package/qt5/qt5.mk                                 |  6 +--
 package/qt5/qt53d/qt53d.hash                       |  4 +-
 ...001-directfb-make-platform-plugin-compile.patch | 28 ++++++++++++++
 .../0006-eglfs-rasp-pi-header-inclusion.patch      | 45 ----------------------
 package/qt5/qt5base/qt5base.hash                   |  4 +-
 package/qt5/qt5base/qt5base.mk                     |  4 +-
 package/qt5/qt5canvas3d/qt5canvas3d.hash           |  4 +-
 package/qt5/qt5connectivity/qt5connectivity.hash   |  4 +-
 package/qt5/qt5declarative/qt5declarative.hash     |  4 +-
 package/qt5/qt5enginio/qt5enginio.hash             |  4 +-
 .../qt5graphicaleffects/qt5graphicaleffects.hash   |  4 +-
 package/qt5/qt5imageformats/qt5imageformats.hash   |  4 +-
 package/qt5/qt5location/qt5location.hash           |  4 +-
 package/qt5/qt5multimedia/qt5multimedia.hash       |  4 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.hash |  4 +-
 .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  4 +-
 package/qt5/qt5script/qt5script.hash               |  4 +-
 package/qt5/qt5sensors/qt5sensors.hash             |  4 +-
 package/qt5/qt5serialbus/qt5serialbus.hash         |  4 +-
 package/qt5/qt5serialport/qt5serialport.hash       |  4 +-
 package/qt5/qt5svg/qt5svg.hash                     |  4 +-
 package/qt5/qt5tools/qt5tools.hash                 |  4 +-
 package/qt5/qt5webchannel/qt5webchannel.hash       |  4 +-
 ...004-Remove-unused-check-for-private_tests.patch | 40 +++++++++++++++++++
 package/qt5/qt5webkit/qt5webkit.hash               |  4 +-
 package/qt5/qt5websockets/qt5websockets.hash       |  4 +-
 package/qt5/qt5x11extras/qt5x11extras.hash         |  4 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |  4 +-
 29 files changed, 121 insertions(+), 99 deletions(-)
 create mode 100644 package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
 delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
 create mode 100644 package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 234dfdd..77e7e09 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -11,15 +11,16 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on !BR2_ARM_CPU_ARMV4
 	default y
 
-comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
+comment "Qt5 needs a toolchain w/ wchar, NPTL, C++11, dynamic library"
 	depends on !BR2_PACKAGE_QT
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS
 
 menuconfig BR2_PACKAGE_QT5
 	bool "Qt5"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT5BASE
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index e937e23..77dd757 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,6 +1,6 @@
-QT5_VERSION_MAJOR = 5.6
-QT5_VERSION = $(QT5_VERSION_MAJOR).2
-QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
+QT5_VERSION_MAJOR = 5.8
+QT5_VERSION = $(QT5_VERSION_MAJOR).0-beta
+QT5_SITE = http://download.qt.io/development_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
 QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
 include $(sort $(wildcard package/qt5/*/*.mk))
 
diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash
index 7179380..345b845 100644
--- a/package/qt5/qt53d/qt53d.hash
+++ b/package/qt5/qt53d/qt53d.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qt3d-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941 qt3d-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qt3d-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 f5cc80e306ffa7ea1b3ae38dfec7da8908a2e7d4d44353d0bd9916a07cfdaa04 qt3d-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch b/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
new file mode 100644
index 0000000..b6c1452
--- /dev/null
+++ b/package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
@@ -0,0 +1,28 @@
+Configuring directfb backend fails due to unknown feature directfb_egl
+
+See : https://bugreports.qt.io/browse/QTBUG-57039
+
+Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
+
+diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
+index 406b89e..a83b09f 100644
+--- a/src/plugins/platforms/directfb/directfb.pro
++++ b/src/plugins/platforms/directfb/directfb.pro
+@@ -3,7 +3,7 @@ TARGET = qdirectfb
+ QT += \
+     core-private gui-private \
+     eventdispatcher_support-private service_support-private \
+-    fontdatabase_support-private egl_support-private
++    fontdatabase_support-private
+ 
+ QMAKE_USE += directfb
+ 
+@@ -27,7 +27,7 @@ HEADERS = qdirectfbintegration.h \
+     qdirectfbeglhooks.h
+ 
+ # ### port the GL context
+-qtConfig(directfb_egl) {
++contains(QT_CONFIG, directfb_egl) {
+     HEADERS += qdirectfb_egl.h
+     SOURCES += qdirectfb_egl.cpp
+     DEFINES += DIRECTFB_GL_EGL
diff --git a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
deleted file mode 100644
index f1f6d9b..0000000
--- a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001
-From: Julien Corjon <corjon.j@ecagroup.com>
-Date: Tue, 21 Jul 2015 09:58:14 +0200
-Subject: [PATCH] eglfs - fix rasp-pi header inclusion
-
-eglplateform.h include headers for low level instruction and fail on brcm
-headers inclusion
-  For the brcm presence test we use egl pkg-config file
-  For the eglfs-plugin compilation we use the egl configuration
-
-Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339
-Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
----
- config.tests/qpa/eglfs-brcm/eglfs-brcm.pro   | 2 ++
- src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-index ce16a3a..192a8ad 100644
---- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-@@ -1,6 +1,8 @@
- SOURCES = eglfs-brcm.cpp
- 
- CONFIG -= qt
-+CONFIG += link_pkgconfig
-+PKGCONFIG += egl
- 
- INCLUDEPATH += $$QMAKE_INCDIR_EGL
- 
-diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-index 0f493fd..8479496 100644
---- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
-+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
- load(qt_plugin)
- 
- QT += platformsupport-private eglfs_device_lib-private
-+CONFIG += egl
- 
- SOURCES += $$PWD/qeglfsmain.cpp
- 
--- 
-2.1.0
-
diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
index 9808e9b..71e423b 100644
--- a/package/qt5/qt5base/qt5base.hash
+++ b/package/qt5/qt5base/qt5base.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 qtbase-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtbase-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 b527598e5f9a8aa4b128e4f7f6661ebbb17857f7e8248b75e536b7782c345f4d qtbase-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 23dba2a..f4ca921 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -41,8 +41,6 @@ else
 QT5BASE_CONFIGURE_OPTS += -release
 endif
 
-QT5BASE_CONFIGURE_OPTS += -largefile
-
 ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
 QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
@@ -170,7 +168,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglDeviceIntegration
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFSDeviceIntegration
 
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets
diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash
index 01819e4..132342c 100644
--- a/package/qt5/qt5canvas3d/qt5canvas3d.hash
+++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtcanvas3d-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad qtcanvas3d-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtcanvas3d-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 30671e07c9b9f811d0b8367f7233a241fac28e3e2478d0e47493ffeb710113d3 qtcanvas3d-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
index 4574f3d..deb5266 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.hash
+++ b/package/qt5/qt5connectivity/qt5connectivity.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtconnectivity-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 qtconnectivity-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtconnectivity-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 524c887a8530ebff913cb72a1d553bde079c30a38acfa04443fd94c7843484fc qtconnectivity-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
index d8d3a68..646631f 100644
--- a/package/qt5/qt5declarative/qt5declarative.hash
+++ b/package/qt5/qt5declarative/qt5declarative.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da qtdeclarative-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtdeclarative-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 d03ca3ab85aac9312a536e4b40a6c0b603b67275adb9fbd8e4efad93390c542b qtdeclarative-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5enginio/qt5enginio.hash b/package/qt5/qt5enginio/qt5enginio.hash
index 9951834..db9eacf 100644
--- a/package/qt5/qt5enginio/qt5enginio.hash
+++ b/package/qt5/qt5enginio/qt5enginio.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtenginio-opensource-src-1.6.2.tar.xz.mirrorlist
-sha256 90ffc38d214a75ab0ef90a4760843f12bc073ae49c17de24c677d1d403bddcc3 qtenginio-opensource-src-1.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtenginio-opensource-src-1.6.2.tar.xz.mirrorlist
+sha256 ea5418a55bd36cbf354bde85480044422865ed284d8eadbc122d6e523b96d00f qtenginio-opensource-src-1.6.2.tar.xz
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
index ae29e3b..153d5dc 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtgraphicaleffects-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e qtgraphicaleffects-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtgraphicaleffects-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 1c68919231875b4c41b1f1c2c18ad6639b5c78f05444483b42e96cda58e8b88e qtgraphicaleffects-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
index 54b58e4..31b6ccc 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.hash
+++ b/package/qt5/qt5imageformats/qt5imageformats.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtimageformats-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 qtimageformats-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtimageformats-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 9d6d7a868188b7b004fe5c68605b3028d32f120ce8815f722c2af33e53d38268 qtimageformats-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
index 374952f..ef90b14 100644
--- a/package/qt5/qt5location/qt5location.hash
+++ b/package/qt5/qt5location/qt5location.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtlocation-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a qtlocation-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtlocation-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 7fa9cda14eddf1053d4c8271d4b100a62ffb3822155b2f0d308f9b4b885d4480  qtlocation-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
index 56a11fb..b3c9da2 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.hash
+++ b/package/qt5/qt5multimedia/qt5multimedia.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtmultimedia-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf qtmultimedia-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtmultimedia-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 66601ca2afe3f1d443d6742a78f7141c153bb5cc64132479139bfe36efd301ff qtmultimedia-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index 6db589d..39726b7 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c qtquickcontrols-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtquickcontrols-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 88a44ca5e0bcaf4ca626d03a056158cbcb423d90f256643175f626fbb8713d58 qtquickcontrols-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
index 0d85d48..9fe8a07 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols2-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 qtquickcontrols2-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtquickcontrols2-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 02fa08257580976d0c518fd139e46b43c5ce79ce6c1c51e92092fb6d235cc113 qtquickcontrols2-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash
index c8ecb75..9fbf0e7 100644
--- a/package/qt5/qt5script/qt5script.hash
+++ b/package/qt5/qt5script/qt5script.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e qtscript-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtscript-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 5450122878c3ecb00dc19aaf5bd67d719ddf1d431d6e4c8c59fef981dbfa99d7 qtscript-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
index 65cd127..03ebba9 100644
--- a/package/qt5/qt5sensors/qt5sensors.hash
+++ b/package/qt5/qt5sensors/qt5sensors.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsensors-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 qtsensors-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtsensors-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 fc15d6edc47cded8997d709623e3dd863d978632ac19b1acb8310732090150f0 qtsensors-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
index 308c365..9fe8306 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.hash
+++ b/package/qt5/qt5serialbus/qt5serialbus.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialbus-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826 qtserialbus-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtserialbus-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 4c551e7c535e4898e7fdf8a64b3a39622938ff1ceec42047c3c70768fd7af9bd qtserialbus-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
index 2458e5d..3af2c7d 100644
--- a/package/qt5/qt5serialport/qt5serialport.hash
+++ b/package/qt5/qt5serialport/qt5serialport.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialport-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 qtserialport-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtserialport-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 ec9c289e10449720a19b50759a99536aad2cb8ef90bd6bdf05dc599d29133ce6 qtserialport-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
index 0c9e9eb..74d3b0c 100644
--- a/package/qt5/qt5svg/qt5svg.hash
+++ b/package/qt5/qt5svg/qt5svg.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsvg-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e qtsvg-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtsvg-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 091c9fc57d5cda919e589d72eb8ad0a6eca8ebf248d5d4c48b41e6faa95eee83 qtsvg-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
index cc11b28..98b0d81 100644
--- a/package/qt5/qt5tools/qt5tools.hash
+++ b/package/qt5/qt5tools/qt5tools.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qttools-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 7a48d2d159375fc0a3af3ce02456429cabe69db2466229853186486a554761d2 qttools-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
index 0f9eaae..8f36aad 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.hash
+++ b/package/qt5/qt5webchannel/qt5webchannel.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebchannel-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 qtwebchannel-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtwebchannel-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 d2221b83c9302ae800a738f7b7ad6d63b79a928ee815596ab60ce703a842949e qtwebchannel-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch b/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch
new file mode 100644
index 0000000..69f4229
--- /dev/null
+++ b/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch
@@ -0,0 +1,40 @@
+From 646ea4ff9efb13d69428b785b4545209f1fac63d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
+Date: Wed, 14 Sep 2016 23:51:14 +0200
+Subject: [PATCH] Remove unused check for private_tests
+
+It turns out that qt_developer_build is never used anyway.
+
+I did some git archeology and it looks like it was nuked when doing the
+5.2 merge from upstream. The original purpose was apparently to control
+-Werror, which is nowadays controlled by CONFIG -= production_build.
+
+This actually fixes the build, as the QT_FOR_CONFIG += core-private which
+would have been required for qtConfig(private_tests) is missing.
+
+Task-number: QTBUG-55950
+Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3
+
+Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
+---
+ Tools/qmake/mkspecs/features/default_pre.prf | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
+index 6bb52d0..8aa806d 100644
+--- a/Tools/qmake/mkspecs/features/default_pre.prf
++++ b/Tools/qmake/mkspecs/features/default_pre.prf
+@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL
+ scratchbox: PYTHON = python2.6
+ else: PYTHON = python
+ 
+-# We use private_tests to detect developer build, since the destdir will
+-# always be our webkit build dir. This might change as configure changes.
+-qtConfig(private_tests): CONFIG += qt_developer_build
+-
+ # By default we enable "production build", and build-webkit, which is
+ # used by bots and developers, will disable it, to enable warnings etc.
+ CONFIG += production_build
+-- 
+2.9.3
+
diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash
index 309f776..8caa3fc 100644
--- a/package/qt5/qt5webkit/qt5webkit.hash
+++ b/package/qt5/qt5webkit/qt5webkit.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/snapshots/qt/5.6/5.6.2/latest_src/submodules/qtwebkit-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 qtwebkit-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/snapshots/qt/5.8/5.8.0-beta/latest_src/submodules/qtwebkit-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 06c41e7383c11de04ad82830092e0bb07c6a641de05de5d4f959a4fbb9019aad qtwebkit-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
index 3443476..5cfb9f3 100644
--- a/package/qt5/qt5websockets/qt5websockets.hash
+++ b/package/qt5/qt5websockets/qt5websockets.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebsockets-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 qtwebsockets-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtwebsockets-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 ad97f4d48de979aaa8c905fb962ed806e8bf8188b4a1a3010986252976661ba3 qtwebsockets-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
index 297c578..1d15605 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.hash
+++ b/package/qt5/qt5x11extras/qt5x11extras.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced qtx11extras-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtx11extras-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 e03ac7bb7b4ccbc78f5afefc5d690f64398fac4aa05c6877a6fafa1e7392ed0e qtx11extras-opensource-src-5.8.0-beta.tar.xz
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
index fa4e97f..8fedb47 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
@@ -1,2 +1,2 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtxmlpatterns-opensource-src-5.6.2.tar.xz.mirrorlist
-sha256 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc qtxmlpatterns-opensource-src-5.6.2.tar.xz
+# Hash from: http://download.qt.io/development_releases/qt/5.8/5.8.0-beta/submodules/qtxmlpatterns-opensource-src-5.8.0-beta.tar.xz.mirrorlist
+sha256 c7bce469b18a82e979385ad6531830e09aac95d88936ca4e5470c40ed9701c12 qtxmlpatterns-opensource-src-5.8.0-beta.tar.xz
-- 
2.9.3

[Buildroot] [Rejected v2 3/7] qt5enginio : move into legacy compatibility

[Julien Corjon]

See https://wiki.qt.io/New_Features_in_Qt_5.7

Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
---
 package/qt5/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 77e7e09..7fe0bfc 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -35,7 +35,6 @@ source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5canvas3d/Config.in"
 source "package/qt5/qt5connectivity/Config.in"
 source "package/qt5/qt5declarative/Config.in"
-source "package/qt5/qt5enginio/Config.in"
 source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5location/Config.in"
@@ -54,6 +53,7 @@ source "package/qt5/qt53d/Config.in"
 source "package/qt5/qt5quickcontrols2/Config.in"
 source "package/qt5/qt5serialbus/Config.in"
 comment "legacy compatibility"
+source "package/qt5/qt5enginio/Config.in"
 source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5webkit/Config.in"
 endif
-- 
2.9.3

[Buildroot] [Rejected v2 4/7] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview

[Julien Corjon]

See http://blog.qt.io/blog/2016/06/16/qt-5-7-released/

Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
---
 package/qt5/Config.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 7fe0bfc..18dad52 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -31,6 +31,7 @@ menuconfig BR2_PACKAGE_QT5
 	  http://qt.io
 
 if BR2_PACKAGE_QT5
+source "package/qt5/qt53d/Config.in"
 source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5canvas3d/Config.in"
 source "package/qt5/qt5connectivity/Config.in"
@@ -40,7 +41,9 @@ source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5location/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5quickcontrols/Config.in"
+source "package/qt5/qt5quickcontrols2/Config.in"
 source "package/qt5/qt5sensors/Config.in"
+source "package/qt5/qt5serialbus/Config.in"
 source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5tools/Config.in"
@@ -48,10 +51,6 @@ source "package/qt5/qt5webchannel/Config.in"
 source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
-comment "technology preview"
-source "package/qt5/qt53d/Config.in"
-source "package/qt5/qt5quickcontrols2/Config.in"
-source "package/qt5/qt5serialbus/Config.in"
 comment "legacy compatibility"
 source "package/qt5/qt5enginio/Config.in"
 source "package/qt5/qt5script/Config.in"
-- 
2.9.3

[Buildroot] [PATCH v2 5/7] Revert "qt5base: install bundled fonts to target"

[Julien Corjon]

qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645

This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384.

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
---
 package/qt5/qt5base/qt5base.mk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index f4ca921..e49718e 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -234,13 +234,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
 	fi
 endef
 
-define QT5BASE_INSTALL_TARGET_FONTS
-	if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
-		mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
-		cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
-	fi
-endef
-
 define QT5BASE_INSTALL_TARGET_EXAMPLES
 	if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
 		mkdir -p $(TARGET_DIR)/usr/lib/qt/examples ; \
-- 
2.9.3

[Buildroot] [Rejected v2 6/7] qt5declarative: enable Quick for non-GL platforms

[Julien Corjon]

However, some modules provide less functionality without OpenGL, so install
steps have to be limited for the softrender only backend:
- qtmultimedia does not provide qml

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
---
 package/qt5/qt5declarative/Config.in       | 4 +---
 package/qt5/qt5multimedia/qt5multimedia.mk | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index eba4c8d..0604e85 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -14,12 +14,10 @@ config BR2_PACKAGE_QT5DECLARATIVE
 
 if BR2_PACKAGE_QT5DECLARATIVE
 
-comment "quick module needs an OpenGL-capable backend"
+comment "quick module without OpenGL-capable backend will use a less performant software backend"
 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
 
 config BR2_PACKAGE_QT5DECLARATIVE_QUICK
 	bool "quick module"
-	select BR2_PACKAGE_QT5BASE_OPENGL
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
 
 endif
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 67e7968..41eb0f6 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -53,11 +53,13 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y)
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
 define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
 	cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/
 endef
 endif
+endif
 
 define QT5MULTIMEDIA_INSTALL_TARGET_CMDS
 	$(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)
-- 
2.9.3

[Buildroot] [Rejected v2 7/7] quickcontrols1/2: enable for software renderer

[Julien Corjon]

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
---
 package/qt5/qt5quickcontrols/Config.in             | 3 +--
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk   | 5 ++++-
 package/qt5/qt5quickcontrols2/Config.in            | 3 +--
 package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 8 +++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
index 0fe8465..d013491 100644
--- a/package/qt5/qt5quickcontrols/Config.in
+++ b/package/qt5/qt5quickcontrols/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
 	bool "qt5quickcontrols"
 	select BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	help
 	  Qt is a cross-platform application and UI framework for
@@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
 
 	  http://qt.io
 
-comment "qt5quickcontrols needs an OpenGL-capable backend"
+comment "Some qt5quickcontrol elements needs an OpenGL-capable backend"
 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index b33ff15..c2946bc 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -31,7 +31,10 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
 endef
 
 define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
-	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
 endef
 
 $(eval $(generic-package))
diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in
index 1e57674..e7271f2 100644
--- a/package/qt5/qt5quickcontrols2/Config.in
+++ b/package/qt5/qt5quickcontrols2/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
 	bool "qt5quickcontrols2"
 	select BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
 	help
 	  Qt is a cross-platform application and UI framework for
@@ -12,6 +11,6 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
 
 	  http://qt.io
 
-comment "qt5quickcontrols2 needs an OpenGL-capable backend"
+comment "Some qt5quickcontrols2 elements need an OpenGL-capable backend"
 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index a5ad3f6..1a2949c 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -31,10 +31,12 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
 endef
 
 define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
-	cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
-	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
-	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
 endef
 
 $(eval $(generic-package))
-- 
2.9.3

[Buildroot] [Rejected v2 1/7] qt5webkit: Get sources from Qt-5-unofficial-builds

[Alexey Brodkin]

Hi Julien,

On Tue, 2016-11-15 at 18:13 +0100, Julien Corjon wrote:
> Instead of messing with git we may get tarballs of obsolete but still
> existing submodules as we used to but from a bit different location.
> 
> It turned out Qt people still create packages for obsolete submodules
> for so-called "unofficial builds", see [1].
> 
> [1] https://wiki.qt.io/Qt-5-unofficial-builds
> 
> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
> ---
> ?package/qt5/qt5.mk???????????????????|??1 +
> ?package/qt5/qt5webkit/qt5webkit.hash |??4 ++--
> ?package/qt5/qt5webkit/qt5webkit.mk???| 14 +++-----------
> ?3 files changed, 6 insertions(+), 13 deletions(-)

I'm wondering what does this mean?
3 hours ago you sent email saying "Reviewed-by" and now reject?

-Alexey

[Buildroot] [Rejected v2 0/7] qt5 bump to 5.8.0-beta

[Алексей Бродкин]

Hi Julien,

2016-11-15 20:13 GMT+03:00 Julien Corjon <corjon.j@ecagroup.com>:
> As I'm, also, working on qt5.8 next bump i made a V2 of Andreas
> series and include a proposed patch from Alexey for convinience.
>
> I mostly work on patch 2/7 to include qtwebkit fix and add C++11
> requirement.
> Patches 6 & 7 are not touched (did not take Arnout comment yet).
>
> Of course as it's a beta version this series is to reject in
> patchwork. But if someone what to give a try on it, comments are
> more than welcome.
>
>
> Alexey Brodkin (1):
>   qt5webkit: Get sources from Qt-5-unofficial-builds

Another thing that I wanted to do was to get qtwebkit-examples back in BR.
IMHO it worth squeezing it in these series.
I'll try to send a corresponding patch a bit later on that regard.

-Alexey

[Buildroot] [Rejected v2 1/7] qt5webkit: Get sources from Qt-5-unofficial-builds

[Julien CORJON]

Alexey,

Le 15/11/2016 ? 18:16, Alexey Brodkin a ?crit :
> Hi Julien,
>
> On Tue, 2016-11-15 at 18:13 +0100, Julien Corjon wrote:
>> Instead of messing with git we may get tarballs of obsolete but still
>> existing submodules as we used to but from a bit different location.
>>
>> It turned out Qt people still create packages for obsolete submodules
>> for so-called "unofficial builds", see [1].
>>
>> [1] https://wiki.qt.io/Qt-5-unofficial-builds
>>
>> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
>> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
>> ---
>>  package/qt5/qt5.mk                   |  1 +
>>  package/qt5/qt5webkit/qt5webkit.hash |  4 ++--
>>  package/qt5/qt5webkit/qt5webkit.mk   | 14 +++-----------
>>  3 files changed, 6 insertions(+), 13 deletions(-)
>
> I'm wondering what does this mean?
> 3 hours ago you sent email saying "Reviewed-by" and now reject?

Sorry for confusion, my whole series is to reject as it's a bump for a 
beta version of Qt (that we do not want in BR mainline).
But as i like your patch a lot (or it simply ease the bump in my series 
;) ), I use your patch.

So yes, your patch is reviewed and my series is to reject!

Julien

>
> -Alexey
>

[Buildroot] [Rejected v2 1/7] qt5webkit: Get sources from Qt-5-unofficial-builds

[Alexey Brodkin]

Hi Julien,

On Tue, 2016-11-15 at 17:22 +0000, Julien CORJON wrote:
> Alexey,
> 
> Le 15/11/2016 ? 18:16, Alexey Brodkin a ?crit :
> > 
> > Hi Julien,
> > 
> > On Tue, 2016-11-15 at 18:13 +0100, Julien Corjon wrote:
> > > 
> > > Instead of messing with git we may get tarballs of obsolete but still
> > > existing submodules as we used to but from a bit different location.
> > > 
> > > It turned out Qt people still create packages for obsolete submodules
> > > for so-called "unofficial builds", see [1].
> > > 
> > > [1] https://wiki.qt.io/Qt-5-unofficial-builds
> > > 
> > > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> > > Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
> > > ---
> > > ?package/qt5/qt5.mk???????????????????|??1 +
> > > ?package/qt5/qt5webkit/qt5webkit.hash |??4 ++--
> > > ?package/qt5/qt5webkit/qt5webkit.mk???| 14 +++-----------
> > > ?3 files changed, 6 insertions(+), 13 deletions(-)
> > 
> > I'm wondering what does this mean?
> > 3 hours ago you sent email saying "Reviewed-by" and now reject?
> 
> Sorry for confusion, my whole series is to reject as it's a bump for a?
> beta version of Qt (that we do not want in BR mainline).
> But as i like your patch a lot (or it simply ease the bump in my series?
> ;) ), I use your patch.
> 
> So yes, your patch is reviewed and my series is to reject!

So I got confused because you CCed me via my Gmail address for
your series and I didn't see it immediately. But now I realized what
was happening.

-Alexey

[Buildroot] [Rejected v2 0/7] qt5 bump to 5.8.0-beta

[Andreas Naumann]

Am 15.11.2016 um 18:13 schrieb Julien Corjon:
> As I'm, also, working on qt5.8 next bump i made a V2 of Andreas
> series and include a proposed patch from Alexey for convinience.
>
> I mostly work on patch 2/7 to include qtwebkit fix and add C++11
> requirement.

Thank you, I was trying to prepare an improved version but couldnt 
figure out the private_tests trouble.

For the directfb patch, I have opened an issue upstream and they reacted 
quite quickly: https://bugreports.qt.io/browse/QTBUG-57039

So my proposal is to wait for that to be solved and then send v3 with 
the remaining comments taken into account.


regards,
Andreas


> Patches 6 & 7 are not touched (did not take Arnout comment yet).
>
> Of course as it's a beta version this series is to reject in
> patchwork. But if someone what to give a try on it, comments are
> more than welcome.
>
>
> Alexey Brodkin (1):
>   qt5webkit: Get sources from Qt-5-unofficial-builds
>
> Julien Corjon (2):
>   qt5enginio : move into legacy compatibility
>   qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview
>
> Naumann Andreas (4):
>   qt5: bump to 5.8.0-beta
>   Revert "qt5base: install bundled fonts to target"
>   qt5declarative: enable Quick for non-GL platforms
>   quickcontrols1/2: enable for software renderer
>
>  package/qt5/Config.in                              | 14 +++----
>  package/qt5/qt5.mk                                 |  7 ++--
>  package/qt5/qt53d/qt53d.hash                       |  4 +-
>  ...001-directfb-make-platform-plugin-compile.patch | 22 +++++++++++
>  .../0006-eglfs-rasp-pi-header-inclusion.patch      | 45 ----------------------
>  package/qt5/qt5base/qt5base.hash                   |  4 +-
>  package/qt5/qt5base/qt5base.mk                     | 11 +-----
>  package/qt5/qt5canvas3d/qt5canvas3d.hash           |  4 +-
>  package/qt5/qt5connectivity/qt5connectivity.hash   |  4 +-
>  package/qt5/qt5declarative/Config.in               |  4 +-
>  package/qt5/qt5declarative/qt5declarative.hash     |  4 +-
>  package/qt5/qt5enginio/qt5enginio.hash             |  4 +-
>  .../qt5graphicaleffects/qt5graphicaleffects.hash   |  4 +-
>  package/qt5/qt5imageformats/qt5imageformats.hash   |  4 +-
>  package/qt5/qt5location/qt5location.hash           |  4 +-
>  package/qt5/qt5multimedia/qt5multimedia.hash       |  4 +-
>  package/qt5/qt5multimedia/qt5multimedia.mk         |  2 +
>  package/qt5/qt5quickcontrols/Config.in             |  3 +-
>  package/qt5/qt5quickcontrols/qt5quickcontrols.hash |  4 +-
>  package/qt5/qt5quickcontrols/qt5quickcontrols.mk   |  5 ++-
>  package/qt5/qt5quickcontrols2/Config.in            |  3 +-
>  .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  4 +-
>  package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk |  8 ++--
>  package/qt5/qt5script/qt5script.hash               |  4 +-
>  package/qt5/qt5sensors/qt5sensors.hash             |  4 +-
>  package/qt5/qt5serialbus/qt5serialbus.hash         |  4 +-
>  package/qt5/qt5serialport/qt5serialport.hash       |  4 +-
>  package/qt5/qt5svg/qt5svg.hash                     |  4 +-
>  package/qt5/qt5tools/qt5tools.hash                 |  4 +-
>  package/qt5/qt5webchannel/qt5webchannel.hash       |  4 +-
>  ...004-Remove-unused-check-for-private_tests.patch | 40 +++++++++++++++++++
>  package/qt5/qt5webkit/qt5webkit.hash               |  4 +-
>  package/qt5/qt5webkit/qt5webkit.mk                 | 14 ++-----
>  package/qt5/qt5websockets/qt5websockets.hash       |  4 +-
>  package/qt5/qt5x11extras/qt5x11extras.hash         |  4 +-
>  package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |  4 +-
>  36 files changed, 137 insertions(+), 133 deletions(-)
>  create mode 100644 package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
>  delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
>  create mode 100644 package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch
>

[Buildroot] [Rejected v2 0/7] qt5 bump to 5.8.0-beta

[Julien CORJON]

Andreas,

Le 16/11/2016 ? 08:41, Andreas Naumann a ?crit :
>
> Am 15.11.2016 um 18:13 schrieb Julien Corjon:
>> As I'm, also, working on qt5.8 next bump i made a V2 of Andreas
>> series and include a proposed patch from Alexey for convinience.
>>
>> I mostly work on patch 2/7 to include qtwebkit fix and add C++11
>> requirement.
>
> Thank you, I was trying to prepare an improved version but couldnt
> figure out the private_tests trouble.

Digging in QTBUG is always a good solution for that kind of issue. At 
the end i figure that https://bugreports.qt.io/browse/QTBUG-55950 fix it.

>
> For the directfb patch, I have opened an issue upstream and they reacted
> quite quickly: https://bugreports.qt.io/browse/QTBUG-57039

Saw that one too when digging in QTBUG. Let's hope a solution will be 
submitted and accepted before 5.8.

>
> So my proposal is to wait for that to be solved and then send v3 with
> the remaining comments taken into account.

Agree, 5.8 version is expected by end of november. I'll take care of the 
respin when this final version will be released. Until then I'll follow 
the already declared bugs :
   - https://bugreports.qt.io/browse/QTBUG-57039 - DirectFB backend
   - https://bugreports.qt.io/browse/QTBUG-57156 - EGLFS_MALI for odroid
   - https://bugreports.qt.io/browse/QTBUG-55950 - Webkit unused check

Regards,

Julien Corjon

>
>
> regards,
> Andreas
>
>
>> Patches 6 & 7 are not touched (did not take Arnout comment yet).
>>
>> Of course as it's a beta version this series is to reject in
>> patchwork. But if someone what to give a try on it, comments are
>> more than welcome.
>>
>>
>> Alexey Brodkin (1):
>>   qt5webkit: Get sources from Qt-5-unofficial-builds
>>
>> Julien Corjon (2):
>>   qt5enginio : move into legacy compatibility
>>   qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview
>>
>> Naumann Andreas (4):
>>   qt5: bump to 5.8.0-beta
>>   Revert "qt5base: install bundled fonts to target"
>>   qt5declarative: enable Quick for non-GL platforms
>>   quickcontrols1/2: enable for software renderer
>>
>>  package/qt5/Config.in                              | 14 +++----
>>  package/qt5/qt5.mk                                 |  7 ++--
>>  package/qt5/qt53d/qt53d.hash                       |  4 +-
>>  ...001-directfb-make-platform-plugin-compile.patch | 22 +++++++++++
>>  .../0006-eglfs-rasp-pi-header-inclusion.patch      | 45
>> ----------------------
>>  package/qt5/qt5base/qt5base.hash                   |  4 +-
>>  package/qt5/qt5base/qt5base.mk                     | 11 +-----
>>  package/qt5/qt5canvas3d/qt5canvas3d.hash           |  4 +-
>>  package/qt5/qt5connectivity/qt5connectivity.hash   |  4 +-
>>  package/qt5/qt5declarative/Config.in               |  4 +-
>>  package/qt5/qt5declarative/qt5declarative.hash     |  4 +-
>>  package/qt5/qt5enginio/qt5enginio.hash             |  4 +-
>>  .../qt5graphicaleffects/qt5graphicaleffects.hash   |  4 +-
>>  package/qt5/qt5imageformats/qt5imageformats.hash   |  4 +-
>>  package/qt5/qt5location/qt5location.hash           |  4 +-
>>  package/qt5/qt5multimedia/qt5multimedia.hash       |  4 +-
>>  package/qt5/qt5multimedia/qt5multimedia.mk         |  2 +
>>  package/qt5/qt5quickcontrols/Config.in             |  3 +-
>>  package/qt5/qt5quickcontrols/qt5quickcontrols.hash |  4 +-
>>  package/qt5/qt5quickcontrols/qt5quickcontrols.mk   |  5 ++-
>>  package/qt5/qt5quickcontrols2/Config.in            |  3 +-
>>  .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash   |  4 +-
>>  package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk |  8 ++--
>>  package/qt5/qt5script/qt5script.hash               |  4 +-
>>  package/qt5/qt5sensors/qt5sensors.hash             |  4 +-
>>  package/qt5/qt5serialbus/qt5serialbus.hash         |  4 +-
>>  package/qt5/qt5serialport/qt5serialport.hash       |  4 +-
>>  package/qt5/qt5svg/qt5svg.hash                     |  4 +-
>>  package/qt5/qt5tools/qt5tools.hash                 |  4 +-
>>  package/qt5/qt5webchannel/qt5webchannel.hash       |  4 +-
>>  ...004-Remove-unused-check-for-private_tests.patch | 40
>> +++++++++++++++++++
>>  package/qt5/qt5webkit/qt5webkit.hash               |  4 +-
>>  package/qt5/qt5webkit/qt5webkit.mk                 | 14 ++-----
>>  package/qt5/qt5websockets/qt5websockets.hash       |  4 +-
>>  package/qt5/qt5x11extras/qt5x11extras.hash         |  4 +-
>>  package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash     |  4 +-
>>  36 files changed, 137 insertions(+), 133 deletions(-)
>>  create mode 100644
>> package/qt5/qt5base/0001-directfb-make-platform-plugin-compile.patch
>>  delete mode 100644
>> package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
>>  create mode 100644
>> package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch
>>
>