diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:51:05 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-20 10:06:37 +0000 |
| commit | f33be06035faaa59cee17e5a97e82d079b4ab444 (patch) | |
| tree | 79d1a995808932b7e9fae144e2b13ddb0b4908a2 /recipes-qt/qt5/qtwayland | |
| parent | c7549747b6e83e9630ae37c7e2595e41e4f1ebac (diff) | |
qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is
no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in
qt5-git.inc nobody noticed).
* qtbase: drop qml-debug options
removed from qtbase in:
commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1
Author: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri Oct 6 16:27:09 2017 +0200
Subject: Remove qml-debug configure flag and feature
* qtgraphicaleffects, qtquickcontrols2, qtquickcontrols,
qtvirtualkeyboard: add qtdeclarative-native dependency
needed for qmlcachegen binary
* qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs
referenced files disappered in:
commit 6882a04fb36642862b11efe514251d32070c3d65
Author: Konstantin Tokarev <annulen@yandex.ru>
Date: Thu Aug 25 19:20:41 2016 +0300
Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch index 04ae7e0e..cfb2ee3e 100644 --- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch @@ -1,4 +1,4 @@ -From e41bc392aa79073926aba917796e836f5b0d9f32 Mon Sep 17 00:00:00 2001 +From 4e1945bd0867c018d06b5fa9c2dcb60619f260b2 Mon Sep 17 00:00:00 2001 From: Raphael Freudiger <laser_b@gmx.ch> Date: Tue, 10 Jan 2017 15:49:55 +0100 Subject: [PATCH] fix build without xkbcommon-evdev @@ -26,17 +26,17 @@ index eae7ad5..0bb7b18 100644 + +LIBS += -lxkbcommon diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro -index dc9000d..4eebfd6 100644 +index 47be591..805c81e 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro -@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) - MODULE_PLUGIN_TYPES = \ - wayland-graphics-integration-server +@@ -34,3 +34,5 @@ MODULE_PLUGIN_TYPES = \ + wayland-hardware-layer-integration \ + load(qt_module) + +LIBS += -lxkbcommon diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index c30f7b1..e6f1a0b 100644 +index e35c0f3..45e82ca 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp @@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) |