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/qtvirtualkeyboard_git.bb | |
| parent | c7549747b6e83e9630ae37c7e2595e41e4f1ebac (diff) | |
| download | meta-qt5-f33be06035faaa59cee17e5a97e82d079b4ab444.tar.gz | |
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/qtvirtualkeyboard_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 0029170f..b89aae9b 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
| @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \ | |||
| 6 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 6 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
| 7 | " | 7 | " |
| 8 | 8 | ||
| 9 | # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.10 | 9 | # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.11 |
| 10 | # 5.10.meta-qt5.2 | 10 | # 5.11.meta-qt5.1 |
| 11 | SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" | 11 | SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" |
| 12 | 12 | ||
| 13 | # To enabled Nuance T9 Write support, you need to provide the licensed components | 13 | # To enabled Nuance T9 Write support, you need to provide the licensed components |
| @@ -51,6 +51,6 @@ RRECOMMENDS_${PN} += "${PN}-dictionaries" | |||
| 51 | FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" | 51 | FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat" |
| 52 | FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | 52 | FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" |
| 53 | 53 | ||
| 54 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" | 54 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
| 55 | 55 | ||
| 56 | SRCREV = "85d35bb12235dd6b92c898ddb6d6e84703d25d48" | 56 | SRCREV = "9055bd56653d2e488b52c66d884109fcccd23c2d" |