aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/nativesdk-qtbase_git.bb
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-01-13 15:40:55 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-01-14 10:02:55 +0200
commit15ce669550e7ee0dae4d16e7cd26d03e7a7a1cf4 (patch)
treeefda9c84b34f6d3f5a37080f0c6398de37bebaef /recipes-qt/qt5/nativesdk-qtbase_git.bb
parent370845a0acaa28d34800dcb08bf76e0d7aeeadb0 (diff)
parent9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
Merge remote-tracking branch 'qt/5.14' into 5.15
NOTE: Qt License agreement update needs more recent Qt modules content from 5.15 branch. Follow-up commit (submodule update) will address the issue. * qt/5.14: 9ff0a362 coin: update poky to 3.1_M1 from master 6776ec35 qtbase, qtwebengine: address issues introduced in latest upstream merge 5b2109a8 Merge remote-tracking branch 'qt/upstream/master' into 5.14 e4e2acba qtbase: Adjust target mkspec settings e8ea2389 qt5: update submodules d8e970eb knx, opcua: update changefiles ca08d8c7 qt5: update submodules f7841daf qt5: update submodules 25039161 qtwebengine: Fix build with 64bit time_t on 32bit architectures 280139a9 qt5: update submodules 4f3ed3ed qtwebkit: add missing flex-native dep 456ec4ac qt5-creator, qtbase: Replace python with python3 f264e5dd qtdeclarative: Ask for python3 explicitly f6ad80f9 qtbase: Fix build on 32bit arches with 64bit time_t b7f4bd20 recipes: Use features_check instead of distro_features_check 1a4ee018 qtwebengine: Fix musl build 02715fff pyqt5: Upgrade to 5.13.2 Conflicts: coin/module_config.yaml 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_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtcoap_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/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtlottie_git.bb recipes-qt/qt5/qtmqtt_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_git.bb recipes-qt/qt5/qtopcua_git.bb recipes-qt/qt5/qtpurchasing_git.bb recipes-qt/qt5/qtquick3d_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 Change-Id: I98dab678c9904aef591fe933bf081b3f297e2021
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 35c35910..2a3778cf 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
- file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \
+ file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
"
QT_MODULE = "qtbase"
@@ -42,6 +42,7 @@ SRC_URI += "\
file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
file://0017-qfloat16-check-for-__ARM_FP-2.patch \
+ file://0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
"
# common for qtbase-native and nativesdk-qtbase