diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-10 09:22:31 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-10 14:03:32 +0200 |
| commit | 251beba0ca5f7fae85b8fd9c20851c53347c9722 (patch) | |
| tree | 6e2a334753d8bfb04e17a4b9ca56f89773a337e1 /recipes-qt/qt5/qtwebkit_git.bb | |
| parent | 1c88e9b361b9df92edf27b7d23f1bc3f07e784a3 (diff) | |
| parent | 8ba28144d5571504112fd4f32c7bfcbac531e2cb (diff) | |
| download | meta-qt5-5.8.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.85.8
* qtyocto/upstream/master:
qtwebengine: disable generate_character_data
qtwayland: fix build without xkbcommon-evdev
qtwayland: Add libxkbcommon in the dependencies
qtbase: create empty oe-device-extra.pri
cmake_qt5.bbclass: add qtbase-native to DEPENDS
Upgrade to Qt 5.8
qtbase: Remove comments about ICU and QtWebKit
qtwebkit: Always enable icu in QT_CONFIG
qtwebengine: use QT_GIT_PROTOCOL variable
Conflicts:
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I8929585c07f462b7ff28c0342386d4114c0c0ee2
Diffstat (limited to 'recipes-qt/qt5/qtwebkit_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index bf5c00ae..4845d0fd 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
| @@ -64,6 +64,9 @@ do_configure_prepend() { | |||
| 64 | sed -e 's/\s\(config_fontconfig: \)/ OE_FONTCONFIG_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | 64 | sed -e 's/\s\(config_fontconfig: \)/ OE_FONTCONFIG_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | # Forcibly enable ICU, so qtbase doesn't need it. | ||
| 68 | EXTRA_QMAKEVARS_PRE += "QT_CONFIG+=icu" | ||
| 69 | |||
| 67 | # qtwebkit gets terribly big when linking with all debug info, disable by default | 70 | # qtwebkit gets terribly big when linking with all debug info, disable by default |
| 68 | QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" | 71 | QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" |
| 69 | EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" | 72 | EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}" |