diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-04 21:33:58 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-05 09:56:49 +0200 |
| commit | 415917d7b990c76a2763c9beb16599e312b2211f (patch) | |
| tree | 1be944d816285f839ed72da8ef83da92f4411bad /patches | |
| parent | b7c00536d892f7d418e2e5ca63706de03dd87585 (diff) | |
| download | ptxdist-415917d7b990c76a2763c9beb16599e312b2211f.tar.gz ptxdist-415917d7b990c76a2763c9beb16599e312b2211f.tar.xz | |
qt5: give qmake the 'default' gcc options, so it can generate the correct gyp options
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/qt-everywhere-opensource-src-5.4.2/0001-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch | 15 |
1 files changed, 12 insertions, 3 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, =) |