summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-09-02 20:25:37 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-09-19 07:44:27 +0300
commita16976979e929618c8fc873b798d78fc82393cab (patch)
treef6881ce7c9119c3b1b3bce75577e2eddd0fa1c45 /recipes-qt/qt5/qtdeclarative
parentab2d92123df243c5668904bb693309a0ecbb2a3c (diff)
downloadmeta-qt5-a16976979e929618c8fc873b798d78fc82393cab.tar.gz
qt5: update submodules
Update to latest content in Qt 5.14.0 branch. Task-number: QTBUG-77876 Change-Id: I3ab35758a7e84bd15d50bcf794a9a3fd1fdaea3e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch36
-rw-r--r--recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch23
2 files changed, 0 insertions, 59 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch
deleted file mode 100644
index d2bac1f7..00000000
--- a/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 5ae643e2ab69892e0dbe296cf14e020c7938ebee Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=B6rg=20Bornemann?= <joerg.bornemann@qt.io>
3Date: Fri, 2 Aug 2019 11:03:06 +0000
4Subject: [PATCH] Revert "Yield error if qtquickcompiler is used in non-QML
5 projects"
6
7This reverts commit c5578b16d6454e708c8ce12661a85d41eeaaa758, because
8it prevents enabling the qtquickcompiler feature globally.
9
10Fixes: QTBUG-77277
11Change-Id: Ic80835c462570a67ae3105bb3d1b6452800d2c94
12Reviewed-by: Kai Koehne <kai.koehne@qt.io>
13---
14 tools/qmlcachegen/qtquickcompiler.prf | 10 ----------
15 1 file changed, 10 deletions(-)
16
17diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf
18index 967d55a5b..b98d8a019 100644
19--- a/tools/qmlcachegen/qtquickcompiler.prf
20+++ b/tools/qmlcachegen/qtquickcompiler.prf
21@@ -1,15 +1,5 @@
22 if(qtc_run|lupdate_run): return()
23
24-!contains(QT, qml) {
25- qt_modules = \
26- $$replace(QT, -private$, _private) \
27- $$replace(QT_PRIVATE, -private$, _private)
28- qt_modules = $$resolve_depends(qt_modules, "QT.", ".depends" ".run_depends")
29- !contains(qt_modules, qml): \
30- error("The qtquickcompiler feature cannot be used without the QML module.")
31- unset(qt_modules)
32-}
33-
34 qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER)
35 qtPrepareTool(QMAKE_RCC, rcc, _DEP)
36
diff --git a/recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch b/recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch
deleted file mode 100644
index 3de99517..00000000
--- a/recipes-qt/qt5/qtdeclarative/0002-scenegraph-fix-error-QOffscreenSurface-does-not-name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 258a0c6a231f2f853858229e9e069aae71290bba Mon Sep 17 00:00:00 2001
2From: Mikko Gronoff <mikko.gronoff@qt.io>
3Date: Mon, 12 Aug 2019 08:27:19 +0300
4Subject: [PATCH] scenegraph: fix error: 'QOffscreenSurface' does not name a
5 type
6
7Change-Id: I41a8b30b316b038ed1e3910adb0254931f385a2a
8---
9 src/quick/scenegraph/qsgrhisupport_p.h | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/src/quick/scenegraph/qsgrhisupport_p.h b/src/quick/scenegraph/qsgrhisupport_p.h
13index 48ad2f0..0e1881a 100644
14--- a/src/quick/scenegraph/qsgrhisupport_p.h
15+++ b/src/quick/scenegraph/qsgrhisupport_p.h
16@@ -86,6 +86,7 @@ QT_BEGIN_NAMESPACE
17
18 class QSGDefaultRenderContext;
19 class QVulkanInstance;
20+class QOffscreenSurface;
21
22 // Opting in/out of QRhi and choosing the default/requested backend is managed
23 // by this singleton. This is because this information may be needed before