diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-26 16:07:49 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-27 07:38:23 +0200 |
| commit | 3bd81f1997683774dd28e6b8673c9b19b66a73ec (patch) | |
| tree | 368a37454e3d7031b33a609ef9a428fa43c73880 /recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | |
| parent | 08cc9ad2579f897b84d4fb430d898103dc568d26 (diff) | |
| parent | 929b2ef266c6eb4cc1f5500f421fda449cd8900b (diff) | |
| download | meta-qt5-3bd81f1997683774dd28e6b8673c9b19b66a73ec.tar.gz | |
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: (22 commits)
qtwebengine: add clang fix
qt5: update submodules
qt5: use PACKAGECONFIG to disable tests and examples
qt5: update submodules
qt5: update submodules
qt5: update submodules
qt5: update submodules
ogl-runtime: update to v2.5.0 release
qttools: don't install tst_qtattributionsscanner
qt5: Upgrade to Qt 5.13.2
python(3)-pyqt5: add qml support
libqofono: bump SRCREV and add a fix for voicecall
qt5: update submodules
qt5: update submodules
qtbase: add openssl PACKAGECONFIG for native nativesdk
ogl-runtime: update to 2.5
qtbase: Add PACKAGECONFIG for lttng
layer: Mark zeus as compatible release
ogl-runtime: Fix build on x86_64
README.md: Document need for 32bit host compiler
...
Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799
Diffstat (limited to 'recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index 0a641bb2..8f0568ad 100644 --- a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From f5c88622ac10601e48a14f31d9299692a9ac62e2 Mon Sep 17 00:00:00 2001 | 1 | From e8d9ebf65245a7ca17bdc3f1ed313c60736e7c9b Mon Sep 17 00:00:00 2001 |
| 2 | From: Max Krummenacher <max.krummenacher@toradex.com> | 2 | From: Max Krummenacher <max.krummenacher@toradex.com> |
| 3 | Date: Sat, 27 Oct 2018 12:29:31 +0000 | 3 | Date: Sat, 27 Oct 2018 12:29:31 +0000 |
| 4 | Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to | 4 | Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to |