diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:14:57 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-29 00:07:14 +0200 |
commit | 04240161ef8ec0f584c68485abc02778786c5e75 (patch) | |
tree | d02eae04e6774cbad54a3fc13e55a373a57bc549 /recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | |
parent | 932b32c1c9e9a3ac833c82ff9273683345056ec7 (diff) | |
download | meta-qt5-04240161ef8ec0f584c68485abc02778786c5e75.tar.gz |
git-recipes: upgrade to latest revision in 5.4 branch
* this gets us close to 5.4.2 for people who want to test it in advance
* I plan to apply this to fido branch (as well as final upgrade to 5.4.2
recipes
* I'm preparing similar patch for 5.5 revisions, which will be applied
only in master branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch index 1f92eed8..f2eed114 100644 --- a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch +++ b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 276b5046788007bcbc5607046becdd44151960c0 Mon Sep 17 00:00:00 2001 | 1 | From 16a55457ce31d467cb331ab8e94b672757ef42b9 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Thu, 18 Dec 2014 13:41:09 +0100 | 3 | Date: Thu, 18 Dec 2014 13:41:09 +0100 |
4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir | 4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir |
@@ -38,5 +38,5 @@ index 9a846d4..07869ef 100644 | |||
38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) | 38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) |
39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") | 39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") |
40 | -- | 40 | -- |
41 | 2.3.1 | 41 | 2.3.5 |
42 | 42 | ||