summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-07-31 13:33:09 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-05 07:26:53 +0000
commit1716c294770b10e41af1b11cbe820ca857168556 (patch)
tree4d757023dab74a100a31eb14ccd686a9999f8c62 /recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch
parent584d86653c658afa3e16bff095101ed11cf61d31 (diff)
downloadmeta-qt5-1716c294770b10e41af1b11cbe820ca857168556.tar.gz
qt5: update to Qt 5.13.1
Change-Id: I1581770fa88763654b62bd7054c889852138ef65 Reviewed-by: Kari Hormi <kari.hormi@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch')
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch36
1 files changed, 36 insertions, 0 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
new file mode 100644
index 00000000..d2bac1f7
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch
@@ -0,0 +1,36 @@
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