From 6566f728ab3d14a4908516fb13ad555dbfe04471 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 11 Dec 2014 15:52:18 +1100 Subject: recipes: upgrade from 5.3.2 to 5.4.0 MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM MJ: qtwebkit: move leveldb dependency to .inc Signed-off-by: Martin Jansa Signed-off-by: Jonathan Liu --- ...QMAKE_CC-when-extracting-C-compiler-flags.patch | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch (limited to 'recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch') diff --git a/recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch b/recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch deleted file mode 100644 index 920dd91b..00000000 --- a/recipes-qt/qt5/qtwebengine/0006-Include-QMAKE_CC-when-extracting-C-compiler-flags.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d242c15eb961fbdee69c0a0989cd100d174a25db Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Wed, 15 Oct 2014 17:01:06 +1100 -Subject: [PATCH 6/6] Include QMAKE_CC when extracting C compiler flags - -This fixes cross-compile settings detection for cross-compilation -environments where the C compiler cross-compilation flags are set in -CC/QMAKE_CC instead of CFLAGS/QMAKE_CFLAGS (e.g. OpenEmbedded). - -Upstream-Status: Backport - -Change-Id: I0a7b0f6c47a00775ec18073a16359c8351363285 -Reviewed-by: Andras Becsi -Signed-off-by: Jonathan Liu ---- - tools/qmake/mkspecs/features/functions.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 78b1190..37dd615 100644 ---- a/tools/qmake/mkspecs/features/functions.prf -+++ b/tools/qmake/mkspecs/features/functions.prf -@@ -14,7 +14,7 @@ defineReplace(getConfigDir) { - } - - defineReplace(extractCFlag) { -- CFLAGS = $$QMAKE_CFLAGS -+ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS - !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS - OPTION = $$find(CFLAGS, $$1) - OPTION = $$split(OPTION, =) --- -2.1.1 - -- cgit v1.2.3-54-g00ecf