diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-16 10:19:45 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-16 11:15:30 +0200 |
commit | 96685678ddb4adf615d037dd4c1dcca23023df19 (patch) | |
tree | 41480f2608c514cc1308445e413cfe06e9e91da3 /recipes-qt/qt5/qtbase-native_git.bb | |
parent | f0ca39edb8dd0524e8822da813399cce2e70ef53 (diff) | |
parent | ff6127ddd318d422f595295d1c189a86b3032873 (diff) |
Merge remote-tracking branch 'qtyocto/5.11' into 5.12
* qtyocto/5.11:
ff6127d Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
6b354b9 qt5: update submodules
4064b3b qtdeclarative: fix inconsistent QML_COMPILE_HASH value
fd1f0f4 python-pyqt5: Update to 5.11.3 and add python3 recipe.
3fa1993 qtbase-native: disable postgresql support
0edbe1b qtbase: refresh patches and update tags on meta-qt5
4ed4385 qtbase: don't leak absolut path to recipe specific sysroot
b3502fb qt5: Disable ltcg for host_build
5832bf2 qtbase: don't use thumb for armv[45]
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtlocation_git.b b
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Task-number: QTBUG-70847
Change-Id: I67e23c7020276516fcace20ff6a1eb698724dd22
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 7d40c5ec..814627a7 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.11 +# 5.11.meta-qt5-shared.12 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -33,19 +33,20 @@ SRC_URI += "\ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ - file://0015-Disable-ltcg-for-host_build.patch \ + file://0016-Disable-ltcg-for-host_build.patch \ + file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.11 +# 5.11.meta-qt5-native.12 SRC_URI += " \ - file://0016-Always-build-uic-and-qvkgen.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0017-Bootstrap-without-linkat-feature.patch \ + file://0019-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" @@ -66,6 +67,7 @@ PACKAGECONFIG_CONFARGS = " \ -no-gui \ -no-sql-mysql \ -no-sql-sqlite \ + -no-sql-psql \ -no-opengl \ -no-openssl \ -no-xcb \ |