diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-24 10:26:07 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-05-09 05:52:19 +0300 |
| commit | db03213142de38997c95f53a5e731a92e9c48d2f (patch) | |
| tree | 43176f11ca4a040b3292bcadeda888367f559a0e /recipes-qt/qt5/qtbase/0012-Always-build-uic.patch | |
| parent | 5d375076a9c2b2e39f99012d3519a1cb2ff5811d (diff) | |
| parent | 7a52f924a0298857db99be20aca1484bb2b4e163 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/rocko' into 5.9
* qtyocto/upstream/rocko:
7a52f92 packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides qttranslations-qtconfig
f48752c qt5: upgrade to 5.9.5
4e7ba65 Change default SRC_URI from github.com to code.qt.io
bf68f8b layer.conf: add LAYERSERIES_COMPAT
5b71698 maliit-framework-qt5: refresh patches
32bb7d1 qt5-git.inc: drop nobranch=1
Conflicts:
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
Change-Id: Ibea502ea07d8b7e145c1fa55cf82d8b70435d983
Diffstat (limited to 'recipes-qt/qt5/qtbase/0012-Always-build-uic.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0012-Always-build-uic.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch index 1e0b516b..0cb36e18 100644 --- a/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0012-Always-build-uic.patch @@ -1,4 +1,4 @@ -From b7ca9eb9abd3cb0b3966519c3a34e74b5e0c6c0e Mon Sep 17 00:00:00 2001 +From 7ad9a6e116879730543ae947abef0fe74a5b0dbb Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 43fc06f..1e9d4dc 100644 +index 3e32f7e..18b268b 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -203,7 +203,7 @@ qtConfig(gui) { +@@ -205,7 +205,7 @@ qtConfig(gui) { } } } |