diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-13 15:40:55 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-14 10:02:55 +0200 |
commit | 15ce669550e7ee0dae4d16e7cd26d03e7a7a1cf4 (patch) | |
tree | efda9c84b34f6d3f5a37080f0c6398de37bebaef /recipes-qt/qt5/qtdeclarative_git.bb | |
parent | 370845a0acaa28d34800dcb08bf76e0d7aeeadb0 (diff) | |
parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (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/qtdeclarative_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 4f3aba91..134f232b 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -12,12 +12,13 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -DEPENDS += "qtbase" - SRC_URI += "\ file://0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch \ + file://0001-Use-python3-explicitly.patch \ " +DEPENDS += "qtbase" + PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug" PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network" |