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/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.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/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch')
| -rw-r--r-- | recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch index acd9a57a..a4103f25 100644 --- a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch @@ -1,4 +1,4 @@ -From 33554f9b3fd493c7e28617fd01466ffa87251f27 Mon Sep 17 00:00:00 2001 +From be5c73c72d1efa90ba440957d6f5ff3278c25545 Mon Sep 17 00:00:00 2001 From: Samuel Stirtzel <s.stirtzel@googlemail.com> Date: Wed, 1 Aug 2012 13:21:51 +0200 Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded @@ -6,16 +6,17 @@ Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded Upstream-Status: Inappropriate [configuration] Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> + --- - config.pri | 8 +++++--- + config.pri | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config.pri b/config.pri -index b037b8c..43409f3 100644 +index 8f24864..94d595a 100644 --- a/config.pri +++ b/config.pri -@@ -161,9 +161,11 @@ contains(QT_MAJOR_VERSION, 4) { - QT_WIDGETS = gui widgets +@@ -144,9 +144,11 @@ noxcb { + DEFINES += NOXCB } -MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features @@ -29,6 +30,3 @@ index b037b8c..43409f3 100644 } defineTest(outputFile) { --- -1.7.9.5 - |