* [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc
@ 2016-12-22 14:21 Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 01/10] qt5: " Andreas Naumann
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
Hi,
since today the release candidate is fixed
http://blog.qt.io/blog/2016/12/22/qt-5-8-0-release-candidate-available/
So here is v4 of bumping to Qt 5.8.
In this version I have updated the hashes and hopefully taken all comments
into account.
I've tested building for SAMA5D3, but didnt go through imx6 and others again.
The issues found by me and Julien, QTBUG-57176, QTBUG-57039 and QTBUG-55950
have been fixed upstream so these patches disappeared.
@Peter: I did not yet add the BSD license for examples as you suggested.
I think that if we want this, we should do this for all modules with examples
and I wanted to get this thing finished first.
Also, I have not added your suggested link to the Qt licensing page. At the
moment http://doc.qt.io/qt-5.8/licensing.html is not yet available and the
one with .../qt-5/licensing.html is a moving/changing target.
-> todo for the release version.
Also, the python-pyqt patch is not strictly necessary for this, but I wanted to
keep things similar to python-pyqt5, as suggested by Thomas.
Now I'm curious what the autobuilder says, however next week I will be mostly
offline...
cheers,
Andreas
Andreas Naumann (7):
qt5: bump to 5.8.0-rc
qt5declarative: enable Quick for non-GL platforms
qt5quickcontrols1/2: enable for software renderer
python-pyqt5: Depend directly on Qt5 rather than its toolchain
requirements
python-pyqt: Depend directly on Qt rather than its toolchain
requirements
python-pyqt5: Fix for Qt 5.8.0
poppler: Compile with -std=c++11
Julien Corjon (3):
qt5enginio : move into legacy compatibility
qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview
Revert "qt5base: install bundled fonts to target"
package/poppler/poppler.mk | 2 +
package/python-pyqt/Config.in | 10 ++---
package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 --------------
package/python-pyqt5/0002-fix-qt5.8-build.patch | 28 ++++++++++++++
package/python-pyqt5/Config.in | 13 ++-----
package/qt5/Config.in | 14 +++----
package/qt5/qt5.mk | 6 +--
package/qt5/qt53d/qt53d.hash | 4 +-
.../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ----------------------
package/qt5/qt5base/qt5base.hash | 4 +-
package/qt5/qt5base/qt5base.mk | 26 ++-----------
package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 +-
package/qt5/qt5connectivity/qt5connectivity.hash | 4 +-
package/qt5/qt5connectivity/qt5connectivity.mk | 4 +-
package/qt5/qt5declarative/Config.in | 6 +--
package/qt5/qt5declarative/qt5declarative.hash | 4 +-
package/qt5/qt5declarative/qt5declarative.mk | 4 +-
.../qt5graphicaleffects/qt5graphicaleffects.hash | 4 +-
.../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 +-
package/qt5/qt5imageformats/qt5imageformats.hash | 4 +-
package/qt5/qt5imageformats/qt5imageformats.mk | 4 +-
package/qt5/qt5location/qt5location.hash | 4 +-
package/qt5/qt5location/qt5location.mk | 4 +-
package/qt5/qt5multimedia/qt5multimedia.hash | 4 +-
package/qt5/qt5multimedia/qt5multimedia.mk | 7 +++-
package/qt5/qt5quickcontrols/Config.in | 4 --
package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 4 +-
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 ++-
package/qt5/qt5quickcontrols2/Config.in | 4 --
.../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/qt5sensors/qt5sensors.mk | 4 +-
package/qt5/qt5serialbus/qt5serialbus.hash | 4 +-
package/qt5/qt5serialport/qt5serialport.hash | 4 +-
package/qt5/qt5serialport/qt5serialport.mk | 4 +-
package/qt5/qt5svg/qt5svg.hash | 4 +-
package/qt5/qt5svg/qt5svg.mk | 4 +-
package/qt5/qt5tools/qt5tools.hash | 4 +-
package/qt5/qt5tools/qt5tools.mk | 4 +-
package/qt5/qt5webchannel/qt5webchannel.hash | 4 +-
package/qt5/qt5webchannel/qt5webchannel.mk | 4 +-
package/qt5/qt5webkit/qt5webkit.hash | 4 +-
package/qt5/qt5websockets/qt5websockets.hash | 4 +-
package/qt5/qt5websockets/qt5websockets.mk | 4 +-
package/qt5/qt5x11extras/qt5x11extras.hash | 4 +-
package/qt5/qt5x11extras/qt5x11extras.mk | 4 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 +-
50 files changed, 134 insertions(+), 212 deletions(-)
delete mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch
create mode 100644 package/python-pyqt5/0002-fix-qt5.8-build.patch
delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
--
1.9.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 01/10] qt5: bump to 5.8.0-rc
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 02/10] qt5enginio : move into legacy compatibility Andreas Naumann
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
- Update hashes (snapshot state of 21-12-2016)
- qt5 need C++11 compliant compiler since 5.7 ([1])
- updated licenses: since version 5.7 Qt removed the (L)GPL v2.1 option in favor
of v3 with a different exception
- qt5base: renamed library to EglFSDeviceIntegration ([2])
- qt5base: remove ras-pi patch, commit c0cc5052097c723d0331a7619d686af9eb93d33c fix it ([3])
- qt5base: removed of 0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch (upstream committed [3b])
- qt5base: remove obsolete config-option -large ([4])
- qt5base: remove gstreamer related config-option ([5])
[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/
[3b] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f1b4bd4790860e1ff5afcec111a359bc3a91cfda
[4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108
[5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203
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 +-
| 45 ----------------------
package/qt5/qt5base/qt5base.hash | 4 +-
package/qt5/qt5base/qt5base.mk | 16 ++------
package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 +-
package/qt5/qt5connectivity/qt5connectivity.hash | 4 +-
package/qt5/qt5connectivity/qt5connectivity.mk | 4 +-
package/qt5/qt5declarative/qt5declarative.hash | 4 +-
package/qt5/qt5declarative/qt5declarative.mk | 4 +-
.../qt5graphicaleffects/qt5graphicaleffects.hash | 4 +-
.../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 +-
package/qt5/qt5imageformats/qt5imageformats.hash | 4 +-
package/qt5/qt5imageformats/qt5imageformats.mk | 4 +-
package/qt5/qt5location/qt5location.hash | 4 +-
package/qt5/qt5location/qt5location.mk | 4 +-
package/qt5/qt5multimedia/qt5multimedia.hash | 4 +-
package/qt5/qt5multimedia/qt5multimedia.mk | 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/qt5sensors/qt5sensors.mk | 4 +-
package/qt5/qt5serialbus/qt5serialbus.hash | 4 +-
package/qt5/qt5serialport/qt5serialport.hash | 4 +-
package/qt5/qt5serialport/qt5serialport.mk | 4 +-
package/qt5/qt5svg/qt5svg.hash | 4 +-
package/qt5/qt5svg/qt5svg.mk | 4 +-
package/qt5/qt5tools/qt5tools.hash | 4 +-
package/qt5/qt5tools/qt5tools.mk | 4 +-
package/qt5/qt5webchannel/qt5webchannel.hash | 4 +-
package/qt5/qt5webchannel/qt5webchannel.mk | 4 +-
package/qt5/qt5webkit/qt5webkit.hash | 4 +-
package/qt5/qt5websockets/qt5websockets.hash | 4 +-
package/qt5/qt5websockets/qt5websockets.mk | 4 +-
| 4 +-
| 4 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 +-
40 files changed, 81 insertions(+), 135 deletions(-)
delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.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..8d1f568 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-rc
+QT5_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/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..086d50f 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qt3d-opensource-src-5.8.0-rc.tar.xz
+sha256 c183e2e5134b20994c18a574b40ddf294ff10815a67d3973b61ac33e923fc821 qt3d-opensource-src-5.8.0-rc.tar.xz
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..c29ffb9 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtbase-opensource-src-5.8.0-rc.tar.xz
+sha256 dcc48b1f7ebf44a39cdab96320d5c243adc040d10d51fe8bba3545a82b2a7cbc qtbase-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 7840a6e..a44fbe3 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -41,12 +41,10 @@ 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)
-QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5BASE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5BASE_LICENSE = Commercial license
QT5BASE_REDISTRIBUTE = NO
@@ -153,14 +151,6 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples
-# gstreamer 0.10 support is broken in qt5multimedia
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
-QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0
-QT5BASE_DEPENDENCIES += gst1-plugins-base
-else
-QT5BASE_CONFIGURE_OPTS += -no-gstreamer
-endif
-
# Build the list of libraries to be installed on the target
QT5BASE_INSTALL_LIBS_y += Qt5Core
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa
@@ -170,7 +160,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..f10dd3f 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtcanvas3d-opensource-src-5.8.0-rc.tar.xz
+sha256 a378b8ce707aea2c48ad90ea4c5fc3359f08f7af0f1508b37daa6b2f0a3a2f41 qtcanvas3d-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
index 4574f3d..ac285b3 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtconnectivity-opensource-src-5.8.0-rc.tar.xz
+sha256 8b95b2db7a205c7f8fd4a7f172173bab8a8056667fcb7b7359e60c8a48183895 qtconnectivity-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index 0f7257d..66ca315 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -11,8 +11,8 @@ QT5CONNECTIVITY_DEPENDENCIES = qt5base
QT5CONNECTIVITY_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5CONNECTIVITY_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5CONNECTIVITY_LICENSE = Commercial license
QT5CONNECTIVITY_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
index d8d3a68..98936d4 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtdeclarative-opensource-src-5.8.0-rc.tar.xz
+sha256 9457188375d2726e469ba76b5d31fb09028ed88f1443a04a0858f158ff24621c qtdeclarative-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index e5a3674..6d3fc0c 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -11,8 +11,8 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
QT5DECLARATIVE_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5DECLARATIVE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5DECLARATIVE_LICENSE = Commercial license
QT5DECLARATIVE_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
index ae29e3b..504394f 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtgraphicaleffects-opensource-src-5.8.0-rc.tar.xz
+sha256 3661d85992b521159e9914f0dd9f867f1914ab69a4e30bd0862ac9aeedc897ae qtgraphicaleffects-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index 223374a..0f78930 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -11,8 +11,8 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5GRAPHICALEFFECTS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5GRAPHICALEFFECTS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5GRAPHICALEFFECTS_LICENSE = Commercial license
QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
index 54b58e4..05ab138 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtimageformats-opensource-src-5.8.0-rc.tar.xz
+sha256 f3c91739c64f7575ee1c3fa49cc3b83f90b249120f863b05516f5eb6d47b0408 qtimageformats-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 921656d..7f39477 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -11,8 +11,8 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base
QT5IMAGEFORMATS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5IMAGEFORMATS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5IMAGEFORMATS_LICENSE = Commercial license
QT5IMAGEFORMATS_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
index 374952f..0206bbb 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtlocation-opensource-src-5.8.0-rc.tar.xz
+sha256 51e18122f45ed3870134487527cacf00b14150a2131378b870b82eb81424931a qtlocation-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index 358b162..93a82b3 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -11,8 +11,8 @@ QT5LOCATION_DEPENDENCIES = qt5base
QT5LOCATION_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5LOCATION_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5LOCATION_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5LOCATION_LICENSE = Commercial license
QT5LOCATION_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
index 56a11fb..38f2a09 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtmultimedia-opensource-src-5.8.0-rc.tar.xz
+sha256 983d0f3d7ab72493cf5ea6f729cc99904090f7e6b8b52d6e48e025bf222e7fba qtmultimedia-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index eb50ac1..2c754fb 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -11,8 +11,8 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base
QT5MULTIMEDIA_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5MULTIMEDIA_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5MULTIMEDIA_LICENSE = Commercial license
QT5MULTIMEDIA_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index 6db589d..2427198 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtquickcontrols-opensource-src-5.8.0-rc.tar.xz
+sha256 89c1d90ca9a8cd613f91d4985eb40edac7124cef0288736e86c61274712fb2a4 qtquickcontrols-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
index 0d85d48..2c04fde 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtquickcontrols2-opensource-src-5.8.0-rc.tar.xz
+sha256 f42686bf5ea529765ef8fc545f00c4accdffacff1fbd2f047ab7bd46d7fce5c8 qtquickcontrols2-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash
index c8ecb75..11b0a52 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtscript-opensource-src-5.8.0-rc.tar.xz
+sha256 673dc3224f7403563f476fa5741fa28557082ecef3af4089f7c1f24d06a7d81b qtscript-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
index 65cd127..c3ee451 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtsensors-opensource-src-5.8.0-rc.tar.xz
+sha256 f2486654b41ed924d20e5562a4daa5d94a3583883778aeb37a17106b00773091 qtsensors-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index 0dd952a..a90c002 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -11,8 +11,8 @@ QT5SENSORS_DEPENDENCIES = qt5base
QT5SENSORS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SENSORS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5SENSORS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5SENSORS_LICENSE = Commercial license
QT5SENSORS_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
index 308c365..21791fd 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtserialbus-opensource-src-5.8.0-rc.tar.xz
+sha256 df4befde6e91a8380c0f105e058ce6c57bb73e799bb20d74d8c50bcf7ee4b9dc qtserialbus-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
index 2458e5d..1c85825 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtserialport-opensource-src-5.8.0-rc.tar.xz
+sha256 d1ae91d30b1e5468605faae0d776be77740bc150fda8e76c4b1cce8416d4d42b qtserialport-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index 04df021..1f64388 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -11,8 +11,8 @@ QT5SERIALPORT_DEPENDENCIES = qt5base
QT5SERIALPORT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SERIALPORT_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5SERIALPORT_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5SERIALPORT_LICENSE = Commercial license
QT5SERIALPORT_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
index 0c9e9eb..35ff912 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtsvg-opensource-src-5.8.0-rc.tar.xz
+sha256 94a31efb7a988241977549600626aad1f3b43b83d0d7beb5e1ad25f7d687a3c8 qtsvg-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index ebd5cba..4725e7d 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -11,8 +11,8 @@ QT5SVG_DEPENDENCIES = qt5base
QT5SVG_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5SVG_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5SVG_LICENSE = Commercial license
QT5SVG_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
index cc11b28..3256f5a 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qttools-opensource-src-5.8.0-rc.tar.xz
+sha256 3d2ebd1b7cf873eb3a751e683f9c3042e3afcaf12314cc44e634e8e2413c79ed qttools-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index 6befb8b..4e2793f 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -20,8 +20,8 @@ QT5TOOLS_DEPENDENCIES += qt5declarative
endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5TOOLS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5TOOLS_LICENSE = Commercial license
QT5TOOLS_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
index 0f9eaae..e6df197 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtwebchannel-opensource-src-5.8.0-rc.tar.xz
+sha256 8e7d7e4d25e915129f87c52dabf6e7dcd264b620daa4879f6854cafc5abf9ea7 qtwebchannel-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 9e94914..92b2758 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -11,8 +11,8 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets
QT5WEBCHANNEL_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5WEBCHANNEL_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5WEBCHANNEL_LICENSE = Commercial license
QT5WEBCHANNEL_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash
index 309f776..387a676 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-rc/latest_src/submodules/qtwebkit-opensource-src-5.8.0-rc.tar.xz
+sha256 b1428aa6f16ee5f91560b3829b64846131be18bf6d3cb7b60d37e737964b66f5 qtwebkit-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
index 3443476..861367a 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtwebsockets-opensource-src-5.8.0-rc.tar.xz
+sha256 f4c2e662a10c32765b1af8aaa3b3f4d1132e301e3bbcc9b77e746f72f5621f56 qtwebsockets-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index f1200c2..c8cb2ea 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -11,8 +11,8 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base
QT5WEBSOCKETS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3
-QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
+QT5WEBSOCKETS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools)
+QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3
else
QT5WEBSOCKETS_LICENSE = Commercial license
QT5WEBSOCKETS_REDISTRIBUTE = NO
--git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
index 297c578..f65b9dd 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtx11extras-opensource-src-5.8.0-rc.tar.xz
+sha256
--git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index a0e1209..7b2042f 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -11,8 +11,8 @@ QT5X11EXTRAS_DEPENDENCIES = qt5base
QT5X11EXTRAS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5X11EXTRAS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5X11EXTRAS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5X11EXTRAS_LICENSE = Commercial license
QT5X11EXTRAS_REDISTRIBUTE = NO
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
index fa4e97f..ce7527f 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/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/qtxmlpatterns-opensource-src-5.8.0-rc.tar.xz
+sha256 551206af362af0de05afed3832e2c4fae6551eae81bd9077dae2f3bdcb102ba4 qtxmlpatterns-opensource-src-5.8.0-rc.tar.xz
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 31477a7..996d70c 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -11,8 +11,8 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base
QT5XMLPATTERNS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+QT5XMLPATTERNS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5XMLPATTERNS_LICENSE = Commercial license
QT5XMLPATTERNS_REDISTRIBUTE = NO
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 02/10] qt5enginio : move into legacy compatibility
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 01/10] qt5: " Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 03/10] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Andreas Naumann
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
From: Julien Corjon <corjon.j@ecagroup.com>
See https://wiki.qt.io/New_Features_in_Qt_5.7
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
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
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 03/10] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 01/10] qt5: " Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 02/10] qt5enginio : move into legacy compatibility Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 04/10] Revert "qt5base: install bundled fonts to target" Andreas Naumann
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
From: Julien Corjon <corjon.j@ecagroup.com>
See http://blog.qt.io/blog/2016/06/16/qt-5-7-released/
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
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"
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 04/10] Revert "qt5base: install bundled fonts to target"
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
` (2 preceding siblings ...)
2016-12-22 14:21 ` [Buildroot] [PATCH v4 03/10] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 05/10] qt5declarative: enable Quick for non-GL platforms Andreas Naumann
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
From: Julien Corjon <corjon.j@ecagroup.com>
qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645
This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384
and part of 186ef9f6f4647ed34b67a3427a5e0e249f0794e7
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
---
package/qt5/qt5base/qt5base.mk | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index a44fbe3..6bca17c 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -230,14 +230,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
done
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
example_dirs=$$(cd $(@D)/examples; find . -mindepth 1 -maxdepth 1 -type d); \
for example in $${example_dirs}; do \
@@ -250,14 +242,12 @@ endef
ifeq ($(BR2_STATIC_LIBS),y)
define QT5BASE_INSTALL_TARGET_CMDS
- $(QT5BASE_INSTALL_TARGET_FONTS)
$(QT5BASE_INSTALL_TARGET_EXAMPLES)
endef
else
define QT5BASE_INSTALL_TARGET_CMDS
$(QT5BASE_INSTALL_TARGET_LIBS)
$(QT5BASE_INSTALL_TARGET_PLUGINS)
- $(QT5BASE_INSTALL_TARGET_FONTS)
$(QT5BASE_INSTALL_TARGET_EXAMPLES)
endef
endif
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 05/10] qt5declarative: enable Quick for non-GL platforms
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
` (3 preceding siblings ...)
2016-12-22 14:21 ` [Buildroot] [PATCH v4 04/10] Revert "qt5base: install bundled fonts to target" Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 06/10] qt5quickcontrols1/2: enable for software renderer Andreas Naumann
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
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 | 6 +-----
package/qt5/qt5multimedia/qt5multimedia.mk | 3 +++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index 6f89dda..233220e 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -14,13 +14,9 @@ config BR2_PACKAGE_QT5DECLARATIVE
if BR2_PACKAGE_QT5DECLARATIVE
-comment "quick module needs an OpenGL-capable 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
+ select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE
config BR2_PACKAGE_QT5DECLARATIVE_EXAMPLES
bool "qt5 declarative examples"
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 2c754fb..ef81212 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -63,11 +63,14 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
endef
endif
+# QtMultimedia QMLs have a hard dependency on OpenGL -> not available for softraster backends
+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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 06/10] qt5quickcontrols1/2: enable for software renderer
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
` (4 preceding siblings ...)
2016-12-22 14:21 ` [Buildroot] [PATCH v4 05/10] qt5declarative: enable Quick for non-GL platforms Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 07/10] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements Andreas Naumann
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
package/qt5/qt5quickcontrols/Config.in | 4 ----
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 ++++-
package/qt5/qt5quickcontrols2/Config.in | 4 ----
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 8 +++++---
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
index 0fe8465..e977c9a 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,3 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
http://qt.io
-comment "qt5quickcontrols 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..6db1d4a 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,3 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
http://qt.io
-comment "qt5quickcontrols2 needs 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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 07/10] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
` (5 preceding siblings ...)
2016-12-22 14:21 ` [Buildroot] [PATCH v4 06/10] qt5quickcontrols1/2: enable for software renderer Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 08/10] python-pyqt: Depend directly on Qt " Andreas Naumann
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
package/python-pyqt5/Config.in | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/package/python-pyqt5/Config.in b/package/python-pyqt5/Config.in
index 4eca68a..20ac988 100644
--- a/package/python-pyqt5/Config.in
+++ b/package/python-pyqt5/Config.in
@@ -1,16 +1,9 @@
-comment "python-pyqt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
- depends on !BR2_PACKAGE_QT
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
- !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
+comment "python-pyqt5 needs Qt5"
+ depends on !BR2_PACKAGE_QT5
config BR2_PACKAGE_PYTHON_PYQT5
bool "python-pyqt5"
- depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_WCHAR # qt5
- depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5
- depends on !BR2_STATIC_LIBS # qt5
- depends on !BR2_PACKAGE_QT # qt5
- select BR2_PACKAGE_QT5
+ depends on BR2_PACKAGE_QT5
select BR2_PACKAGE_PYTHON_SIP
help
Python bindings for Qt 5
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 08/10] python-pyqt: Depend directly on Qt rather than its toolchain requirements
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
` (6 preceding siblings ...)
2016-12-22 14:21 ` [Buildroot] [PATCH v4 07/10] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 09/10] python-pyqt5: Fix for Qt 5.8.0 Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 10/10] poppler: Compile with -std=c++11 Andreas Naumann
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
package/python-pyqt/Config.in | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/package/python-pyqt/Config.in b/package/python-pyqt/Config.in
index a50cb74..6934a4c 100644
--- a/package/python-pyqt/Config.in
+++ b/package/python-pyqt/Config.in
@@ -1,13 +1,9 @@
-comment "python-pyqt needs a toolchain w/ C++, threads"
- depends on BR2_USE_MMU
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "python-pyqt needs Qt4"
+ depends on !BR2_PACKAGE_QT
config BR2_PACKAGE_PYTHON_PYQT
bool "python-pyqt"
- depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_TOOLCHAIN_HAS_THREADS # qt
- depends on BR2_USE_MMU # qt
- select BR2_PACKAGE_QT
+ depends on BR2_PACKAGE_QT
select BR2_PACKAGE_PYTHON_SIP
help
PyQt4 for Qt Embedded 4 bindings.
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 09/10] python-pyqt5: Fix for Qt 5.8.0
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
` (7 preceding siblings ...)
2016-12-22 14:21 ` [Buildroot] [PATCH v4 08/10] python-pyqt: Depend directly on Qt " Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 10/10] poppler: Compile with -std=c++11 Andreas Naumann
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
Just follow https://code.qt.io/cgit/qt/qtbase.git/commit/?id=2be25273e1fc81c5a9e5124f1444100bdb3d458a
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 -------------------------
package/python-pyqt5/0002-fix-qt5.8-build.patch | 28 +++++++++++++++++++++++++
2 files changed, 28 insertions(+), 28 deletions(-)
delete mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch
create mode 100644 package/python-pyqt5/0002-fix-qt5.8-build.patch
diff --git a/package/python-pyqt5/0002-fix-qt-5.6.2.patch b/package/python-pyqt5/0002-fix-qt-5.6.2.patch
deleted file mode 100644
index a56af09..0000000
--- a/package/python-pyqt5/0002-fix-qt-5.6.2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix the build with Qt 5.6.2
-
-Building PyQt 5.7 with versions of Qt older than Qt 5.7 is supposed to
-work, but currently fails in practice. In fact, this is due to the
-fact that the %Timeline variable in QtCoremod.sip didn't contain the
-5.6.2 Qt version, so if this version was used, PyQt was assuming it
-was the later version 5.7, and therefore started enabling APIs only
-available in Qt 5.7, causing build failures when building against Qt
-5.6.2.
-
-Adding Qt_5_6_2 to the timeline fixes this problem. This fix was
-suggested by Phil Thompson <phil@riverbankcomputing.com>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip
-===================================================================
---- PyQt5_gpl-5.7.orig/sip/QtCore/QtCoremod.sip 2016-07-25 15:55:37.000000000 +0200
-+++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip 2016-10-26 15:45:43.577153825 +0200
-@@ -22,7 +22,7 @@
-
- %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1)
-
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_7_0}
-
- %Platforms {WS_X11 WS_WIN WS_MACX}
-
diff --git a/package/python-pyqt5/0002-fix-qt5.8-build.patch b/package/python-pyqt5/0002-fix-qt5.8-build.patch
new file mode 100644
index 0000000..d0cf250
--- /dev/null
+++ b/package/python-pyqt5/0002-fix-qt5.8-build.patch
@@ -0,0 +1,28 @@
+Fix the build with Qt 5.8.0
+
+WindowCancelButtonHint and WindowOkButtonHint were removed in qt5 qtbase
+commit 2be25273e1fc81c5a9e5124f1444100bdb3d458a.
+
+Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
+
+
+Index: python-pyqt5-5.7/QtCore/sipQtCoreQt.cpp
+===================================================================
+--- python-pyqt5-5.7.orig/QtCore/sipQtCoreQt.cpp 2016-12-20 14:53:14.240498721 +0100
++++ python-pyqt5-5.7/QtCore/sipQtCoreQt.cpp 2016-12-20 15:01:28.604481049 +0100
+@@ -1090,7 +1090,6 @@
+ {sipName_WindingFill, static_cast<int>(Qt::WindingFill), 345},
+ {sipName_Window, static_cast<int>(Qt::Window), 418},
+ {sipName_WindowActive, static_cast<int>(Qt::WindowActive), 416},
+- {sipName_WindowCancelButtonHint, static_cast<int>(Qt::WindowCancelButtonHint), 418},
+ {sipName_WindowCloseButtonHint, static_cast<int>(Qt::WindowCloseButtonHint), 418},
+ {sipName_WindowContextHelpButtonHint, static_cast<int>(Qt::WindowContextHelpButtonHint), 418},
+ {sipName_WindowDoesNotAcceptFocus, static_cast<int>(Qt::WindowDoesNotAcceptFocus), 418},
+@@ -1103,7 +1102,6 @@
+ {sipName_WindowMinimized, static_cast<int>(Qt::WindowMinimized), 416},
+ {sipName_WindowModal, static_cast<int>(Qt::WindowModal), 415},
+ {sipName_WindowNoState, static_cast<int>(Qt::WindowNoState), 416},
+- {sipName_WindowOkButtonHint, static_cast<int>(Qt::WindowOkButtonHint), 418},
+ {sipName_WindowOverridesSystemGestures, static_cast<int>(Qt::WindowOverridesSystemGestures), 418},
+ {sipName_WindowShadeButtonHint, static_cast<int>(Qt::WindowShadeButtonHint), 418},
+ {sipName_WindowShortcut, static_cast<int>(Qt::WindowShortcut), 391},
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH v4 10/10] poppler: Compile with -std=c++11
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
` (8 preceding siblings ...)
2016-12-22 14:21 ` [Buildroot] [PATCH v4 09/10] python-pyqt5: Fix for Qt 5.8.0 Andreas Naumann
@ 2016-12-22 14:21 ` Andreas Naumann
9 siblings, 0 replies; 11+ messages in thread
From: Andreas Naumann @ 2016-12-22 14:21 UTC (permalink / raw
To: buildroot
Qt depends on C++11 support since version 5.7
Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
package/poppler/poppler.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index f042914..dcb6fa1 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -14,6 +14,8 @@ POPPLER_INSTALL_STAGING = YES
POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
--enable-xpdf-headers
+POPPLER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
+
ifeq ($(BR2_PACKAGE_CAIRO),y)
POPPLER_CONF_OPTS += --enable-cairo-output
POPPLER_DEPENDENCIES += cairo
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-12-22 14:21 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-22 14:21 [Buildroot] [PATCH v4 00/10] qt bump to 5.8.0-rc Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 01/10] qt5: " Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 02/10] qt5enginio : move into legacy compatibility Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 03/10] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 04/10] Revert "qt5base: install bundled fonts to target" Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 05/10] qt5declarative: enable Quick for non-GL platforms Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 06/10] qt5quickcontrols1/2: enable for software renderer Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 07/10] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 08/10] python-pyqt: Depend directly on Qt " Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 09/10] python-pyqt5: Fix for Qt 5.8.0 Andreas Naumann
2016-12-22 14:21 ` [Buildroot] [PATCH v4 10/10] poppler: Compile with -std=c++11 Andreas Naumann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.