diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-15 13:15:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-03-01 13:05:23 +0200 |
| commit | a96836aedf30d2e26fbcafc13b1313d1325a0730 (patch) | |
| tree | d525675103a4ddc88c25c2303b509f71bd447f32 /recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch | |
| parent | e721e84659869e4a04838d95d7cdbab9d48f5c3d (diff) | |
| parent | db881bb4917628ad3eb1fa7c4f27915cf2ae60f4 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/rocko' into 5.9
* qtyocto/upstream/rocko:
qwt-qt5: rewrite completely
qt5: upgrade to 5.9.4
qt: refresh remaining patches and tags in meta-qt5 repos
qtwebengine: explicitly depend on bison-native
qtlocation: correct PACKAGECONFIG for mapboxgl
gstreamer1.0-plugins-bad: add expansion parameter
Bump to Qt 5.9.3
Conflicts:
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I1a9a35640f301f60d8363d4c3a6bb226ea40c2d1
Diffstat (limited to 'recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index 8ef4f61c..ce990867 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From f02c4f742e90023e87d148bda48401b11815d8ba Mon Sep 17 00:00:00 2001 +From f3b3aa5bde4f9461dcdfbbbe32efb1741bfa1b00 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <denys@ti.com> Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -15,7 +15,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index 76bb27e4ae..9ac81027c9 100644 +index dc703ec..961b41e 100644 --- a/configure.pri +++ b/configure.pri @@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) { |