diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 15:44:17 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:06 +0200 |
| commit | 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (patch) | |
| tree | bdf9c293b998f776a26d6ad2ec273f282333f929 /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | a0b2220b5e08a7914d55afec0ff6e2316cb47404 (diff) | |
| download | meta-qt5-2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed.tar.gz | |
qt: refresh remaining patches and add links to meta-qt5 repos
* remove
qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
which is already applied and fuzzy patch just apply the same section
twice
* restore
qttools/0001-add-noqtwebkit-configuration.patch
which was removed from SRC_URI in 5.9 upgrade
* add comment with link to meta-qt5 repository where the meta-qt5 .patch
files are maintained, include branch and tag name so that it's more
clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index e1b30c9a..d229c21d 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -25,6 +25,8 @@ require qt5-git.inc | |||
| 25 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" | 25 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" |
| 26 | 26 | ||
| 27 | # common for qtbase-native, qtbase-nativesdk and qtbase | 27 | # common for qtbase-native, qtbase-nativesdk and qtbase |
| 28 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared | ||
| 29 | # 5.9.meta-qt5-shared.1 | ||
| 28 | SRC_URI += "\ | 30 | SRC_URI += "\ |
| 29 | file://0001-Add-linux-oe-g-platform.patch \ | 31 | file://0001-Add-linux-oe-g-platform.patch \ |
| 30 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 32 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
| @@ -37,6 +39,8 @@ SRC_URI += "\ | |||
| 37 | " | 39 | " |
| 38 | 40 | ||
| 39 | # common for qtbase-native and nativesdk-qtbase | 41 | # common for qtbase-native and nativesdk-qtbase |
| 42 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native | ||
| 43 | # 5.9.meta-qt5-native.1 | ||
| 40 | SRC_URI += " \ | 44 | SRC_URI += " \ |
| 41 | file://0009-Always-build-uic.patch \ | 45 | file://0009-Always-build-uic.patch \ |
| 42 | " | 46 | " |
