diff options
| author | Julien Brianceau \\(jbriance\\) <jbriance@cisco.com> | 2014-12-31 08:26:36 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-07-24 13:42:07 -0300 |
| commit | 149ff27e48a3403f42548c0e8f5d6b09aaf09f25 (patch) | |
| tree | 7678683f66ceaec11e43ece2d1eea9f2e4064ea5 | |
| parent | 448587c98c82877edbe788b246d7e89a9c43c190 (diff) | |
| download | tizen-distro-149ff27e48a3403f42548c0e8f5d6b09aaf09f25.tar.gz tizen-distro-149ff27e48a3403f42548c0e8f5d6b09aaf09f25.tar.bz2 tizen-distro-149ff27e48a3403f42548c0e8f5d6b09aaf09f25.zip | |
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
(From meta-qt5 rev: ad958ec94752371aa25bfbfd0f60489a20a45c0f)
Signed-off-by: Julien Brianceau <jbriance@cisco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | 2 | ||||
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-qt5/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/meta-qt5/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index 081bcac0e3..7a94dffedf 100644 --- a/meta-qt5/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/meta-qt5/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/meta-qt5/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/meta-qt5/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 081bcac0e3..7a94dffedf 100644 --- a/meta-qt5/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/meta-qt5/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) + |