diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:44:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:45:10 +0200 |
| commit | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch) | |
| tree | 5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch | |
| parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
| parent | 432ad2aa6c3a13253fefc909faba368851d21fb1 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus:
432ad2a qttools: don't install tst_qtattributionsscanner
8115617 qt5: Upgrade to Qt 5.13.2
267e646 python(3)-pyqt5: add qml support
653e12f libqofono: bump SRCREV and add a fix for voicecall
cefb48e qtbase: Add PACKAGECONFIG for lttng
911b346 layer: Mark zeus as compatible release
c373272 ogl-runtime: Fix build on x86_64
9172ba1 README.md: Document need for 32bit host compiler
db2fd6c qtwayland: Fix build with clang/libc++
6b5122e qtbase: Fix build when fp16 is used
Conflicts:
recipes-qt/qt5/ogl-runtime_git.bb
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch index 0152574a..262ad95e 100644 --- a/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch +++ b/recipes-qt/qt5/qtdeclarative/0001-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-locate-qmlca.patch @@ -1,4 +1,4 @@ -From 793ddd0d9fc0d86425a0aa43709445c5ff12a464 Mon Sep 17 00:00:00 2001 +From 2ca54b2296463f626f8438825907610cb22169fc Mon Sep 17 00:00:00 2001 From: Piotr Tworek <tworaz@tworaz.net> Date: Wed, 3 Jul 2019 01:13:40 +0200 Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to locate qmlcachegen @@ -30,6 +30,3 @@ index 75fbb0fcf3..1e949cd40c 100644 if(NOT EXISTS \"${compiler_path}\" ) message(FATAL_ERROR \"The package \\\"Qt5QuickCompilerConfig\\\" references the file \\\"${compiler_path}\\\" --- -2.21.0 - |