diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-26 12:33:42 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-26 12:35:47 +0300 |
commit | 0778f92089010ac7e2c3ee1f36c8c9d5c102bbf9 (patch) | |
tree | 350f24eea810ef2b3f83605ed7d2c985d3ba18e7 /recipes-qt/qt5/qtconnectivity_git.bb | |
parent | a2158ae2f8e347335b0e96f5524f173078819eee (diff) | |
parent | 3c86e3c28f00129fd408f9ad8daddd034bb19161 (diff) |
Merge remote-tracking branch 'qtyocto/5.12' into 5.13
* qtyocto/5.12:
3c86e3c qt5; update submodules
f2b9b30 qt5: update submodules
51064b4 qt3d-runtime: update to v2.3
e413185 qtbase-native: add native libdir to search path
9a61679 opcua: add license used in open62541 3rdparty sources
7742142 qtopcua: update recipe
d4f557a qt5: update submodules
bd7a586 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
0b0a608 qtbase: let user decide how to link openssl to Qt5 libraries
47d1132 qtbase: fix target mkspec adjustment
87f0462 qttools/cmake: use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
fe88b99 nativesdk-qtbase: use rpath for nativesdk Qt tools
92c34de qt5: cleanup mkspecs
e117b58 qtbase: Fix test builds with clang/x86_64
6280bef qtscript: add fix for build with gcc 8.3
77ed8fb qtbase: Adjust target mkspec settings
26205f4 qt5: update submodules
126927e qt5: update submodules
75c7d00 qt5-creator: Do not ship two desktop files
6629131 packagegroup-qt5-toolchain-target: add qtbase-tools
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/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.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/qtknx_git.bb
recipes-qt/qt5/qtlocation_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/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: I9991c57607dbbe4f6352eb586a61e2f4796128f5
Diffstat (limited to 'recipes-qt/qt5/qtconnectivity_git.bb')
0 files changed, 0 insertions, 0 deletions