diff options
| -rw-r--r-- | patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch | 15 | ||||
| -rw-r--r-- | rules/qt5.make | 2 |
2 files changed, 13 insertions, 4 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 index 90a2673c2..c18bbbf99 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.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch @@ -4,11 +4,11 @@ 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(+) + 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..830696ff2feb 100644 +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) { @@ -19,3 +19,12 @@ index 4c2547d571db..830696ff2feb 100644 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/rules/qt5.make b/rules/qt5.make index fc9164976..66fce1d39 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -202,7 +202,7 @@ ifndef PTXCONF_QT5_MODULE_QTWEBKIT_VIDEO QT5_QMAKE_OPT += "WEBKIT_CONFIG-=video use_gstreamer use_native_fullscreen_video glib" endif ifdef PTXCONF_QT5_MODULE_QTWEBENGINE -QT5_QMAKE_OPT += "GYP_CONFIG+=arm_float_abi=$(shell ptxd_cross_cc_v | sed -n "s/^COLLECT_GCC_OPTIONS=.*'-mfloat-abi=\([^']*\)'.*/\1/p" | tail -n1)" +QT5_QMAKE_OPT += "PTX_QMAKE_CFLAGS=$(shell ptxd_cross_cc_v | sed -n "s/^COLLECT_GCC_OPTIONS=\(.*\)/\1/p" | tail -n1)" endif $(STATEDIR)/qt5.prepare: |