diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-11 13:53:17 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-11 13:53:51 +0300 |
| commit | 5aeeb6f72b048e0dd804fae74fa0e359182828de (patch) | |
| tree | f97af4c3abec8cfec24ad64c7eb0f115b9eb867c | |
| parent | c8a3fd4b856e6f71d4811da2a0514c7656687c35 (diff) | |
| parent | 79a0e938922f85638b578a9ae0f21c8856176e68 (diff) | |
Merge remote-tracking branch 'qtyocto/5.13' into 5.14
* qtyocto/5.13:
79a0e93 qt5: update submodules
9c73608 Use pcre packages by default
ff4e4b2 qtbase-native: disable vulkan support
6699712 qtbase: update module
6ee7a2f qtbase: update module
7f3bdff qtbase: update module
7ce1036 qt5: update submodules
Change-Id: I5c2dc4e13d6f2fcdcaa114c03267f8fdde6905ab
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 8b3c742d..8828fd3c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -73,6 +73,7 @@ QT_CONFIG_FLAGS = " \ -no-sql-sqlite \ -no-sql-psql \ -no-opengl \ + -no-vulkan \ -no-openssl \ -no-xcb \ -no-icu \ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index d5d97d45..a13897e2 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -49,7 +49,7 @@ PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_RELEASE ?= "release" # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency # PACKAGECONFIG_OPENSSL ?= "openssl" -PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev widgets tools libs freetype tests \ +PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev widgets tools libs freetype tests pcre \ ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \ " |