mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] qt5 bump to 5.5.0
@ 2015-08-05  9:42 Tim Sander
  2015-08-05 15:43 ` Philipp Zabel
  0 siblings, 1 reply; 3+ messages in thread
From: Tim Sander @ 2015-08-05  9:42 UTC (permalink / raw)
  To: ptxdist

Hi

Below is a bump of qt to the newest released version.
It adapts the existing patches to qt5 and adds two new modules
Qt3d and QtCanvas3d. I have not had the time to test these.
The new module qtandroidextras is skipped as it is not relevant for ptxdist.

It "Works for me" (tm).

Signed-off-by: Tim Sander <tim@krieglstein.org>
---
 ...t-qtwebengine-allow-building-with-ptxdsit.patch | 30 -------------------
 ...ve-is-an-optional-dependency-for-qtwebkit.patch | 22 --------------
 ...a-videonode-plugins-require-qtmultimediaq.patch | 23 ---------------
 ...HACK-put-wayland-scanner-outout-in-srcdir.patch | 24 ---------------
 ...tures-don-t-use-gold-linker-for-host-tool.patch | 24 ---------------
 patches/qt-everywhere-opensource-src-5.4.2/series  |  8 -----
 ...t-qtwebengine-allow-building-with-ptxdsit.patch | 34 ++++++++++++++++++++++
 ...ve-is-an-optional-dependency-for-qtwebkit.patch | 26 +++++++++++++++++
 ...a-videonode-plugins-require-qtmultimediaq.patch | 27 +++++++++++++++++
 ...HACK-put-wayland-scanner-outout-in-srcdir.patch | 28 ++++++++++++++++++
 ...tures-don-t-use-gold-linker-for-host-tool.patch | 28 ++++++++++++++++++
 patches/qt-everywhere-opensource-src-5.5.0/series  |  5 ++++
 rules/qt5.in                                       | 10 ++++++-
 rules/qt5.make                                     | 14 +++++++--
 14 files changed, 169 insertions(+), 134 deletions(-)
 delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
 delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
 delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
 delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
 delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
 delete mode 100644 patches/qt-everywhere-opensource-src-5.4.2/series
 create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
 create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
 create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
 create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
 create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
 create mode 100644 patches/qt-everywhere-opensource-src-5.5.0/series

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
deleted file mode 100644
index c18bbbf..0000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
-index 4c2547d571db..6b5d34b527a5 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) {
- }
- 
- 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, =)
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 2145c91..0000000
--- 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 10d99a4..0000000
--- 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/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
deleted file mode 100644
index 2ea4c75..0000000
--- a/patches/qt-everywhere-opensource-src-5.4.2/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index df02743..0000000
--- 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 d689a39..0000000
--- 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.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
new file mode 100644
index 0000000..f7d86ad
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
@@ -0,0 +1,34 @@
+From 18d8d3381e3caca32b2c253f34917280cca47972 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 12 May 2015 11:38:35 +0200
+Subject: [PATCH 1/8] 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(-)
+
+diff --git a/qtwebengine/tools/qmake/mkspecs/features/functions.prf b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
+index ef0320da1af0..460f9a91c49f 100644
+--- a/qtwebengine/tools/qmake/mkspecs/features/functions.prf
++++ b/qtwebengine/tools/qmake/mkspecs/features/functions.prf
+@@ -16,6 +16,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)
+@@ -72,7 +73,7 @@ defineReplace(getChromiumSrcDir) {
+ }
+ 
+ defineReplace(extractCFlag) {
+-    CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
++    CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$PTX_QMAKE_CFLAGS
+     OPTION = $$find(CFLAGS, $$1)
+     OPTION = $$split(OPTION, =)
+     return ($$member(OPTION, 1))
+-- 
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch b/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
new file mode 100644
index 0000000..60a4a57
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0002-qtdeclarative-is-an-optional-dependency-for-qtwebkit.patch
@@ -0,0 +1,26 @@
+From fc0ba7fc2fc39ff76c7fd507cc93be775bca02d2 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 29 Apr 2014 18:35:43 +0200
+Subject: [PATCH 2/8] 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 6876dfba1853..5eaf64caa111 100644
+--- a/qt.pro
++++ b/qt.pro
+@@ -76,7 +76,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)
+-- 
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch b/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
new file mode 100644
index 0000000..dda536a
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch
@@ -0,0 +1,27 @@
+From d571d941407e5951475dec60e28474d924e2a3a3 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 12 May 2015 11:29:53 +0200
+Subject: [PATCH 3/8] 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
+-- 
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch b/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
new file mode 100644
index 0000000..6e62a8a
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0004-HACK-put-wayland-scanner-outout-in-srcdir.patch
@@ -0,0 +1,28 @@
+From 7d644980fd38e6d7cba0378d8e19b2602beba4ba Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 10 Nov 2014 17:44:10 +0100
+Subject: [PATCH 4/8] 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) {
+-- 
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch b/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
new file mode 100644
index 0000000..d6e94c6
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/0005-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch
@@ -0,0 +1,28 @@
+From 590cbb399b51dcbc280442c8188cea5841a5fed9 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 2 Jun 2015 17:35:01 +0200
+Subject: [PATCH 5/8] 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
+-- 
+1.9.1
+
diff --git a/patches/qt-everywhere-opensource-src-5.5.0/series b/patches/qt-everywhere-opensource-src-5.5.0/series
new file mode 100644
index 0000000..327dd1e
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.5.0/series
@@ -0,0 +1,5 @@
+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
diff --git a/rules/qt5.in b/rules/qt5.in
index 2670ac4..a78b075 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -11,7 +11,7 @@ menuconfig QT5
 	select GCCLIBS_CXX
 	select GCCLIBS_GCC_S
 	select ZLIB
-	select DBUS			if QT5_DBUS || QT5_MODULE_QTWEBENGINE
+	select DBUS			if QT5_DBUS
 	select GLIB			if QT5_GLIB
 	select LIBPNG			if QT5_LIBPNG
 	select LIBJPEG			if QT5_LIBJPEG
@@ -255,6 +255,14 @@ config QT5_MODULE_QTBASE
 
 if QT5_MODULE_QTBASE
 
+config QT5_MODULE_QT3D
+	bool
+	prompt "Qt3D"
+
+config QT5_MODULE_QTCANVAS3D
+	bool
+	prompt "QtCanvas3D"
+
 config QT5_MODULE_QTBASE_ACCESSIBILITY
 	bool
 	default QT5_ACCESSIBILITY && QT5_MODULE_QTBASE_WIDGETS
diff --git a/rules/qt5.make b/rules/qt5.make
index 330ad55..9f2e32a 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QT5) += qt5
 #
 # Paths and names
 #
-QT5_VERSION	:= 5.4.2
-QT5_MD5		:= c23bd0f14d66e7901d24906a1edce9b0
+QT5_VERSION	:= 5.5.0
+QT5_MD5		:= 24d387fbb0e3042cc48aeaff5627bbb6
 QT5		:= qt-everywhere-opensource-src-$(QT5_VERSION)
 QT5_SUFFIX	:= tar.xz
 QT5_URL		:= \
@@ -136,7 +136,11 @@ QT5_CONF_OPT	:= \
 	$(call ptx/ifdef, PTXCONF_QT5_PREPARE_EXAMPLES,-make examples) \
 	-skip qtactiveqt \
 	-skip qtandroidextras \
+	$(call ptx/qt5-module, QT3D, qt3d) \
+	-skip qtactiveqt \
+	-skip qtandroidextras \
 	$(call ptx/qt5-module, QTCONNECTIVITY, qtconnectivity) \
+	$(call ptx/qt5-module, QTCANVAS3D, qtcanvas3d) \
 	$(call ptx/qt5-module, QTDECLARATIVE, qtdeclarative) \
 	$(call ptx/qt5-module, QTENGINIO, qtenginio) \
 	-skip qtdoc \
@@ -297,12 +301,18 @@ QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_LINUXFB)			+= platforms/libqlinuxfb
 QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTBASE_GUI)			+= platforms/libqminimal
 QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_EGLFS)			+= platforms/libqminimalegl
 
+### Qt3d ###
+QT5_LIBS_$(PTXCONF_QT5_MODULE_QT3D)				+= Qt3d
+
 ### QtConnectivity ###
 QT5_LIBS-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY)			+= Qt5Bluetooth
 QT5_LIBS-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY)			+= Qt5Nfc
 QT5_QML-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY_QUICK)		+= QtBluetooth
 QT5_QML-$(PTXCONF_QT5_MODULE_QTCONNECTIVITY_QUICK)		+= QtNfc
 
+### QtCanvas3d ###
+QT5_LIBS_$(PTXCONF_QT5_MODULE_CANVAS3D)				+= QtCanvas3d
+
 ### QtDeclarative ###
 QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE)			+= Qt5Qml
 QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK)		+= Qt5Quick
-- 
1.9.1

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-05 16:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-05  9:42 [ptxdist] [PATCH] qt5 bump to 5.5.0 Tim Sander
2015-08-05 15:43 ` Philipp Zabel
2015-08-05 16:00   ` Tim Sander

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox