diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 14:52:48 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 14:52:48 +0200 |
| commit | 3208763b8b3f65b17825ded4b2c9b9166d78f2b2 (patch) | |
| tree | 9b4d2c0f4bf069f1f23c37e66be00041c192b271 /recipes-qt/qt5/qtwayland | |
| parent | 3fa7bb148ed40bd018ce51b5f20c0c8792638568 (diff) | |
qt5: rename <module>-git directories with patches to just <module>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
2 files changed, 63 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch new file mode 100644 index 00000000..a7be5e5e --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch @@ -0,0 +1,32 @@ +From ecaf131c0307f198f8efbf06410976ded97aab80 Mon Sep 17 00:00:00 2001 +From: Simon Busch <morphis@gravedo.de> +Date: Fri, 19 Jul 2013 13:35:14 +0000 +Subject: [PATCH] Install the qtwaylandscanner tool to the native side + +Upstream-Status: Inappropiate [configuration] + +Signed-off-by: Simon Busch <morphis@gravedo.de> +--- + src/qtwaylandscanner/qtwaylandscanner.pro | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro +index ac2d07b..7a46a24 100644 +--- a/src/qtwaylandscanner/qtwaylandscanner.pro ++++ b/src/qtwaylandscanner/qtwaylandscanner.pro +@@ -1,6 +1,10 @@ + option(host_build) + +-SOURCES += qtwaylandscanner.cpp ++TARGET = qtwaylandscanner$$qtPlatformTargetSuffix() ++CONFIG += console warn_off ++QT = core + +-load(qt_tool) ++SOURCES += qtwaylandscanner.cpp + ++target.path = $$[QT_HOST_BINS] ++INSTALLS += target +-- +2.3.1 + diff --git a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch new file mode 100644 index 00000000..e1a41db3 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch @@ -0,0 +1,31 @@ +From 90fc9f3f059c19e84ffd29718482a2f06ec3f0bf Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 22 Feb 2014 17:47:44 +0100 +Subject: [PATCH] examples/wayland: include server-buffer only when building + with opengles2 + +* it's using glBindBuffer in + server-buffer/client/serverbufferrenderer.cpp + +Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + examples/wayland/wayland.pro | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro +index d633fb9..643c7cd 100644 +--- a/examples/wayland/wayland.pro ++++ b/examples/wayland/wayland.pro +@@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { + SUBDIRS += qml-compositor + } + +- SUBDIRS += server-buffer ++ contains(QT_CONFIG, opengles2) { ++ SUBDIRS += server-buffer ++ } + } +-- +2.3.5 + |