diff options
author | Julien Brianceau \(jbriance\) <jbriance@cisco.com> | 2014-12-31 08:26:36 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-05 14:08:24 +0100 |
commit | ad958ec94752371aa25bfbfd0f60489a20a45c0f (patch) | |
tree | dd44127194667b6dc9081363e33c4f271a47c767 /recipes-qt | |
parent | 46c76e43e73d914b5833e93b2a0fa7b5a8d00002 (diff) |
qtbase: Add gcc to QMAKE_COMPILER variable.
According to mkspecs/features/spec_post.prf, QMAKE_COMPILER variable should at least contain gcc for linux-oe-g++ platform.
This patch fixes a crash issue in QtWebKit introduced in v5.4.0 by:
https://qt.gitorious.org/qt/qtwebkit/commit/34d4628b981add039a9a349723cbdff1dadca144
Signed-off-by: Julien Brianceau <jbriance@cisco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index 081bcac0..7a94dffe 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch @@ -224,7 +224,7 @@ index 0000000..ca26b10 +include(../common/g++-unix.conf) + +# tc settings from g++-base.conf -+QMAKE_COMPILER = $(OE_QMAKE_COMPILER) ++QMAKE_COMPILER = $(OE_QMAKE_COMPILER) gcc +QMAKE_CC = $(OE_QMAKE_CC) +QMAKE_CXX = $(OE_QMAKE_CXX) + diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 081bcac0..7a94dffe 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -224,7 +224,7 @@ index 0000000..ca26b10 +include(../common/g++-unix.conf) + +# tc settings from g++-base.conf -+QMAKE_COMPILER = $(OE_QMAKE_COMPILER) ++QMAKE_COMPILER = $(OE_QMAKE_COMPILER) gcc +QMAKE_CC = $(OE_QMAKE_CC) +QMAKE_CXX = $(OE_QMAKE_CXX) + |