diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-22 13:36:16 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-22 13:36:16 +0200 |
| commit | c8c8613d679241b2ceac39e248a3062cc2e56ccd (patch) | |
| tree | c1a47ac8b8a04a80ac98b38015f58254980fffb9 /recipes-qt/qt5/qtconnectivity_git.bb | |
| parent | 62312010bba98e2b93f24b8b9e06736f9199df9e (diff) | |
| parent | fb71293f257c6fd02ccc06765a96dbf11d4569a0 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
* qtyocto/upstream/master:
fb71293 qtwebengine: drop 0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
38ec325 qwt-qt5: upgrade 6.1.3 -> 6.1.4
e2d9845 qwt-qt5: Fix multilib install
5be2654 qtwebengine: Fix build with clang/libc++ on aarch64/arm
cb1b472 qtbase: Export host compiler and linker
6d919b0 qt5-plugin-generic-vboxtouch: Fix build with clang/libc++
6713882 maliit-framework,maliit-plugins: Fix build with libc++
9a83f2d qtconnectivity: Fix build with clang/libc++
080cc29 qtwayland: workaround upstream bug: install missing headers manually
f6f61b0 gstreamer1.0-plugins-good: fix qt5 dependency
d055d6a qtbase: Update the PACKAGECONFIG_KDE to enable more
82abc2b qtbase: fix incomplete recipe changes from previous commit
f4c8cef qtbase: Fix qtopcua issue on bigendian systems
be8bc9f qtwebkit: Disable JIT for mips64
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I4ec16ed288fda7270c59abe70d337e7016f547c7
Diffstat (limited to 'recipes-qt/qt5/qtconnectivity_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index aa3bd323..a9f18a30 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " +SRC_URI += "file://0001-Add-missing-header-for-errno.patch" + DEPENDS += "qtbase qtdeclarative" inherit bluetooth |