qt5: version bump 5.4.1 -> 5.4.2

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

6 files changed, 122 insertions, 0 deletions

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.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
new file mode 100644
index 000000000..90a2673c2
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
@@ -0,0 +1,21 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 12 May 2015 11:38:35 +0200
+Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdsit
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qtwebengine/tools/qmake/mkspecs/features/functions.prf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
+index 4c2547d571db..830696ff2feb 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)
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
new file mode 100644
index 000000000..2145c913e
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000..10d99a483
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
@@ -0,0 +1,23 @@
+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/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch b/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
new file mode 100644
index 000000000..2ea4c7587
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 10 Nov 2014 17:44:10 +0100
+Subject: [PATCH] HACK: put wayland-scanner outout in srcdir
+
+The include paths are currently broken when building OOT
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ qtbase/mkspecs/features/wayland-scanner.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qtbase/mkspecs/features/wayland-scanner.prf b/qtbase/mkspecs/features/wayland-scanner.prf
+index 5a97d98373fa..a5477e8f9b42 100644
+--- a/qtbase/mkspecs/features/wayland-scanner.prf
++++ b/qtbase/mkspecs/features/wayland-scanner.prf
+@@ -26,7 +26,7 @@ defineReplace(waylandScannerHeaderFiles) {
+ }
+ 
+ qt_install_headers {
+-    header_dest = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
++    header_dest = $$MODULE_BASE_INDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
+ 
+     header_files_client = $$waylandScannerHeaderFiles(client, $$header_dest)
+     !isEmpty(header_files_client) {
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
new file mode 100644
index 000000000..df027434d
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..d689a39d8
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.4.2/series
@@ -0,0 +1,8 @@
+# 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