qt5: version bump 5.4.2 -> 5.6.0

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

11 files changed, 134 insertions, 90 deletions

diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch b/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
deleted file mode 100644
index 2145c913e..000000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 29 Apr 2014 18:35:43 +0200
-Subject: [PATCH] qtdeclarative is an optional dependency for qtwebkit
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- qt.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qt.pro b/qt.pro
-index 15fd48ec71f3..a1d87b9a9d24 100644
---- a/qt.pro
-+++ b/qt.pro
-@@ -77,7 +77,7 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia)
- addModule(qtpim, qtdeclarative)
- addModule(qtwebsockets, qtbase, qtdeclarative)
- addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
--addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors qtwebchannel, WebKit.pro)
-+addModule(qtwebkit, qtbase, qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel, WebKit.pro)
- addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
- addModule(qtwebkit-examples, qtwebkit qttools)
- addModule(qtimageformats, qtbase)
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch b/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
deleted file mode 100644
index 10d99a483..000000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 12 May 2015 11:29:53 +0200
-Subject: [PATCH] qtmultimedia: videonode plugins require
- qtmultimediaquicktools
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- qtmultimedia/src/src.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/qtmultimedia/src/src.pro b/qtmultimedia/src/src.pro
-index 26f99bc29fe3..6cbe4f0347ad 100644
---- a/qtmultimedia/src/src.pro
-+++ b/qtmultimedia/src/src.pro
-@@ -23,6 +23,8 @@ qtHaveModule(quick) {
-     SUBDIRS += \
-         src_qtmultimediaquicktools \
-         src_imports
-+
-+    src_plugins.depends += src_qtmultimediaquicktools
- }
- 
- # Optional bits
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch b/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
deleted file mode 100644
index df027434d..000000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 2 Jun 2015 17:35:01 +0200
-Subject: [PATCH] featuresfeatures: don't use gold linker for host tools
-
-The check it it is supported was only done for the target.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- qtbase/mkspecs/features/default_post.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtbase/mkspecs/features/default_post.prf b/qtbase/mkspecs/features/default_post.prf
-index e967399258ad..7f08ba31c308 100644
---- a/qtbase/mkspecs/features/default_post.prf
-+++ b/qtbase/mkspecs/features/default_post.prf
-@@ -62,7 +62,7 @@ debug {
-     QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
- }
- 
--use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
-+!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
- 
- dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
- static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/series b/patches/qt-everywhere-opensource-src-5.4.2/series
deleted file mode 100644
index d689a39d8..000000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/series
+++ /dev/null
@@ -1,8 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
-0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
-0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
-0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
-0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
-# 487e45ed5135b1e39410672e7ce9351c  - git-ptx-patches magic
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch b/patches/qt-everywhere-opensource-src-5.6.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
index c18bbbf99..db225cdc6 100644
--- a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
@@ -4,27 +4,19 @@ Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdsit
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- qtwebengine/tools/qmake/mkspecs/features/functions.prf | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ qtwebengine/tools/qmake/mkspecs/features/functions.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-index 4c2547d571db..6b5d34b527a5 100644
+index 2df689bcad14..d2dc988c0233 100644
 --- a/qtwebengine/tools/qmake/mkspecs/features/functions.prf
 +++ b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-@@ -12,6 +12,7 @@ defineTest(isPlatformSupported) {
-   !isPythonVersionSupported(): return(false)
-   linux-g++*|win32-msvc2013|macx-clang: return(true)
-   boot2qt: return(true)
-+  linux-ptx-g++: return(true)
- 
-   skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
-   return(false)
-@@ -61,7 +62,7 @@ defineReplace(getChromiumSrcDir) {
+@@ -105,7 +105,7 @@ defineReplace(getChromiumSrcDir) {
  }
  
  defineReplace(extractCFlag) {
 -    CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
 +    CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$PTX_QMAKE_CFLAGS
-     !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS
      OPTION = $$find(CFLAGS, $$1)
      OPTION = $$split(OPTION, =)
+     return ($$member(OPTION, 1))
diff --git a/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch b/patches/qt-everywhere-opensource-src-5.6.0/0002-HACK-put-wayland-scanner-outout-in-srcdir.patch
index 2ea4c7587..2ea4c7587 100644
--- a/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0002-HACK-put-wayland-scanner-outout-in-srcdir.patch
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0003-eglfs-plugin-needs-egl-for-correct-cflags.patch b/patches/qt-everywhere-opensource-src-5.6.0/0003-eglfs-plugin-needs-egl-for-correct-cflags.patch
new file mode 100644
index 000000000..957d0b72a
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0003-eglfs-plugin-needs-egl-for-correct-cflags.patch
@@ -0,0 +1,22 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 15 Feb 2016 15:24:41 +0100
+Subject: [PATCH] eglfs-plugin: needs egl for correct cflags
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qtbase/src/plugins/platforms/eglfs/eglfs-plugin.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/qtbase/src/plugins/platforms/eglfs/eglfs-plugin.pro b/qtbase/src/plugins/platforms/eglfs/eglfs-plugin.pro
+index 0f493fdc01d7..79a2e708e894 100644
+--- a/qtbase/src/plugins/platforms/eglfs/eglfs-plugin.pro
++++ b/qtbase/src/plugins/platforms/eglfs/eglfs-plugin.pro
+@@ -7,6 +7,8 @@ load(qt_plugin)
+ 
+ QT += platformsupport-private eglfs_device_lib-private
+ 
++CONFIG += egl
++
+ SOURCES += $$PWD/qeglfsmain.cpp
+ 
+ OTHER_FILES += $$PWD/eglfs.json
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0004-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch b/patches/qt-everywhere-opensource-src-5.6.0/0004-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
new file mode 100644
index 000000000..f51b8411c
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0004-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
@@ -0,0 +1,22 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 15 Feb 2016 16:39:24 +0100
+Subject: [PATCH] qtwebengine: make sure sysroot is always set on ARM
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qtwebengine/src/core/gyp_run.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtwebengine/src/core/gyp_run.pro b/qtwebengine/src/core/gyp_run.pro
+index dea1a2225ae2..b14c7db4a404 100644
+--- a/qtwebengine/src/core/gyp_run.pro
++++ b/qtwebengine/src/core/gyp_run.pro
+@@ -47,7 +47,7 @@ cross_compile {
+ 
+ contains(QT_ARCH, "arm") {
+     # Chromium will set a default sysroot on arm unless we give it one.
+-    !cross_compile: GYP_CONFIG += sysroot=\"\"
++    !cross_compile|isEmpty(TOOLCHAIN_SYSROOT): GYP_CONFIG += sysroot=\"\"
+ 
+     GYP_CONFIG += target_arch=arm
+ 
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0005-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch b/patches/qt-everywhere-opensource-src-5.6.0/0005-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
new file mode 100644
index 000000000..743650049
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0005-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
@@ -0,0 +1,23 @@
+From: Philipp Zabel <p.zabel@pengutronix.de>
+Date: Tue, 4 Aug 2015 13:53:28 +0200
+Subject: [PATCH] qtwebengine: #define TRUE in case of USE_SYSTEM_LIBJPEG
+
+Otherwise libjpeg headers typedefs boolean to an incompatible enum.
+
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
+---
+ qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+index 8a08fe0291af..ef52a292ac87 100644
+--- a/qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
++++ b/qtwebengine/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+@@ -13,6 +13,7 @@
+ 
+ extern "C" {
+ #if defined(USE_SYSTEM_LIBJPEG)
++#define TRUE
+ #include <jpeglib.h>
+ #elif defined(USE_LIBJPEG_TURBO)
+ #include "third_party/libjpeg_turbo/jpeglib.h"
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0006-qtbase-examples-fix-building-without-session-managem.patch b/patches/qt-everywhere-opensource-src-5.6.0/0006-qtbase-examples-fix-building-without-session-managem.patch
new file mode 100644
index 000000000..c9fa5065b
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0006-qtbase-examples-fix-building-without-session-managem.patch
@@ -0,0 +1,53 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 29 Feb 2016 16:21:24 +0100
+Subject: [PATCH] qtbase: examples: fix building without session management
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qtbase/examples/widgets/mainwindows/application/mainwindow.cpp | 4 ++++
+ qtbase/examples/widgets/mainwindows/application/mainwindow.h   | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/qtbase/examples/widgets/mainwindows/application/mainwindow.cpp b/qtbase/examples/widgets/mainwindows/application/mainwindow.cpp
+index 861b908189d8..9b8ae818282a 100644
+--- a/qtbase/examples/widgets/mainwindows/application/mainwindow.cpp
++++ b/qtbase/examples/widgets/mainwindows/application/mainwindow.cpp
+@@ -59,9 +59,11 @@ MainWindow::MainWindow()
+     connect(textEdit->document(), &QTextDocument::contentsChanged,
+             this, &MainWindow::documentWasModified);
+ 
++#ifndef QT_NO_SESSIONMANAGER
+     QGuiApplication::setFallbackSessionManagementEnabled(false);
+     connect(qApp, &QGuiApplication::commitDataRequest,
+             this, &MainWindow::commitData);
++#endif
+ 
+     setCurrentFile(QString());
+     setUnifiedTitleAndToolBarOnMac(true);
+@@ -388,6 +390,7 @@ QString MainWindow::strippedName(const QString &fullFileName)
+ }
+ //! [49]
+ 
++#ifndef QT_NO_SESSIONMANAGER
+ void MainWindow::commitData(QSessionManager &manager)
+ {
+     if (manager.allowsInteraction()) {
+@@ -399,3 +402,4 @@ void MainWindow::commitData(QSessionManager &manager)
+             save();
+     }
+ }
++#endif
+diff --git a/qtbase/examples/widgets/mainwindows/application/mainwindow.h b/qtbase/examples/widgets/mainwindows/application/mainwindow.h
+index 9712604125b5..690e8ebc32ea 100644
+--- a/qtbase/examples/widgets/mainwindows/application/mainwindow.h
++++ b/qtbase/examples/widgets/mainwindows/application/mainwindow.h
+@@ -70,7 +70,9 @@ private slots:
+     bool saveAs();
+     void about();
+     void documentWasModified();
++#ifndef QT_NO_SESSIONMANAGER
+     void commitData(QSessionManager &);
++#endif
+ 
+ private:
+     void createActions();
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/series b/patches/qt-everywhere-opensource-src-5.6.0/series
new file mode 100644
index 000000000..7508d5dcb
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.6.0/series
@@ -0,0 +1,9 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+0002-HACK-put-wayland-scanner-outout-in-srcdir.patch
+0003-eglfs-plugin-needs-egl-for-correct-cflags.patch
+0004-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
+0005-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
+0006-qtbase-examples-fix-building-without-session-managem.patch
+# e60df989524d3e5a942768e7b6daf9f0  - git-ptx-patches magic