diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-20 12:23:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-20 12:32:50 +0200 |
| commit | bd7a586d835d1dd0a5b201338e223fb94adc4380 (patch) | |
| tree | 2ec50ae595f291ccc80f046f6824c7f03d7b1f2a /recipes-qt/qt5/qtxmlpatterns_git.bb | |
| parent | 26205f49f51b5727d75bf8f02a894e04bf7b7942 (diff) | |
| parent | 0b0a608ddc55acf1f817aee03e65a06017239bed (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
* upstream/master:
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
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/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
recipes-qt/qt5/qtbase_git.bb
Change-Id: Iaa69404f2d91bd492eea527548b7cf7c504b7bde
Diffstat (limited to 'recipes-qt/qt5/qtxmlpatterns_git.bb')
0 files changed, 0 insertions, 0 deletions