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/qtremoteobjects_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/qtremoteobjects_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index e70579ab..5d0dee15 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
| @@ -11,8 +11,8 @@ require qt5-git.inc | |||
| 11 | 11 | ||
| 12 | DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" | 12 | DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" |
| 13 | 13 | ||
| 14 | # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.10 | 14 | # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.11 |
| 15 | # 5.10.meta-qt5.2 | 15 | # 5.11.meta-qt5.1 |
| 16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
| 17 | file://0001-Allow-a-tools-only-build.patch \ | 17 | file://0001-Allow-a-tools-only-build.patch \ |
| 18 | " | 18 | " |
| @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
| 24 | 24 | ||
| 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 26 | 26 | ||
| 27 | SRCREV = "61d2de26db7b90ad0ed3923b5deecd1c5b3be46a" | 27 | SRCREV = "db6d07b4a51813e72eee474a6ee2e91438841fa7" |
| 28 | 28 | ||
| 29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |