diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-09 09:22:52 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-26 09:13:26 +0100 |
commit | a1122895cba5a50506ab22ffc2211e8d8c67e09d (patch) | |
tree | db769dfb1a98c80a5a770ba4eef7b8f1737e9401 /patches/qt-everywhere-src-5.12.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch | |
parent | 7965e309e43d8101ca27637aa6bcaed1823a69db (diff) | |
download | ptxdist-a1122895cba5a50506ab22ffc2211e8d8c67e09d.tar.gz ptxdist-a1122895cba5a50506ab22ffc2211e8d8c67e09d.tar.xz |
qt5: version bump 5.6.3 -> 5.12.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/qt-everywhere-src-5.12.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch')
-rw-r--r-- | patches/qt-everywhere-src-5.12.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/patches/qt-everywhere-src-5.12.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch b/patches/qt-everywhere-src-5.12.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch new file mode 100644 index 000000000..c7292d4c1 --- /dev/null +++ b/patches/qt-everywhere-src-5.12.1/0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch @@ -0,0 +1,23 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 12 May 2015 11:38:35 +0200 +Subject: [PATCH] ptxdist: qtwebengine: allow building with ptxdist + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + qtwebengine/mkspecs/features/functions.prf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/qtwebengine/mkspecs/features/functions.prf b/qtwebengine/mkspecs/features/functions.prf +index f433de3b278f..e7e4955c8292 100644 +--- a/qtwebengine/mkspecs/features/functions.prf ++++ b/qtwebengine/mkspecs/features/functions.prf +@@ -11,7 +11,8 @@ defineReplace(getChromiumSrcDir) { + } + + defineReplace(extractCFlag) { +- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS ++ PTX_QMAKE_CFLAGS = $$(PTX_QMAKE_CFLAGS) ++ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$split(PTX_QMAKE_CFLAGS, " ") + OPTION = $$find(CFLAGS, $$1) + OPTION = $$split(OPTION, =) + PARAM = $$member(OPTION, 1) |