diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2014-02-14 16:22:07 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-03-02 21:05:05 +0100 |
| commit | ee56c351b7ccc91f7a289372b3144e9f99c2a545 (patch) | |
| tree | b62b4968a6a7fd033e93e501d8e6eae37d923363 /package/qt5/qt5base/qt5base-CMake-don-t-require-GL-when-build-with-no-opengl.patch | |
| parent | afebed35a19b587729631f5cf922456a34bfb33c (diff) | |
| download | buildroot-ee56c351b7ccc91f7a289372b3144e9f99c2a545.tar.gz buildroot-ee56c351b7ccc91f7a289372b3144e9f99c2a545.zip | |
Qt5: patches for linuxfb only systems
Merged patches from the official qtbase/stable branch,
not part of 5.2.1.
Signed-off-by: Peter Kümmel <syntheticpp@gmx.net>
Acked-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5base/qt5base-CMake-don-t-require-GL-when-build-with-no-opengl.patch')
| -rw-r--r-- | package/qt5/qt5base/qt5base-CMake-don-t-require-GL-when-build-with-no-opengl.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/qt5/qt5base/qt5base-CMake-don-t-require-GL-when-build-with-no-opengl.patch b/package/qt5/qt5base/qt5base-CMake-don-t-require-GL-when-build-with-no-opengl.patch new file mode 100644 index 0000000000..e04bcc4d63 --- /dev/null +++ b/package/qt5/qt5base/qt5base-CMake-don-t-require-GL-when-build-with-no-opengl.patch @@ -0,0 +1,28 @@ +From 02edc30764935d64f0994a9c592ca729f1c37410 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net> +Date: Fri, 31 Jan 2014 22:28:19 +0100 +Subject: [PATCH] CMake: don't require GL when build with -no-opengl + +Task-number: QTBUG-36509 +Change-Id: I03451527ab91754d87ff2a43985952c7c7641826 +Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> +--- + src/gui/gui.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/gui.pro b/src/gui/gui.pro +index 3203b41..f4c35a3 100644 +--- a/src/gui/gui.pro ++++ b/src/gui/gui.pro +@@ -81,7 +81,7 @@ contains(QT_CONFIG, angle) { + !isEmpty(QMAKE_LIBDIR_OPENGL_ES2): CMAKE_OPENGL_LIBDIR = $$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2) + CMAKE_GL_HEADER_NAME = GLES2/gl2.h + CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2 +- } else { ++ } else:contains(QT_CONFIG, opengl) { + !isEmpty(QMAKE_INCDIR_OPENGL): CMAKE_GL_INCDIRS = $$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL) + CMAKE_OPENGL_INCDIRS = $$cmakePortablePaths($$QMAKE_INCDIR_OPENGL) + CMAKE_OPENGL_LIBS = $$cmakeProcessLibs($$QMAKE_LIBS_OPENGL) +-- +1.8.3.2 + |
