summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-10-19 08:13:33 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2018-10-19 11:02:52 +0000
commitaecbcd8423e44b89bd187bf0ecf9caa14283e581 (patch)
treecf56765d839b7a5c4fce88971c93c76a246d836f /recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch
parent21f10e47108ed83d92da2c80574b884bdbc83cf1 (diff)
downloadmeta-qt5-aecbcd8423e44b89bd187bf0ecf9caa14283e581.tar.gz
qt5: update submodules
Update to latest 5.12.0 snapshot. Obsolete qtscript patch removed. Task-number: QTBUG-70847 Change-Id: I88ca3639bb015d108019d40a6910fc51cac1f887 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch')
-rw-r--r--recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch7
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch b/recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch
index bc61e538..4a4505a1 100644
--- a/recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch
+++ b/recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch
@@ -1,4 +1,4 @@
1From e6247a6823d372cc779934cf6c74d65bae9652b5 Mon Sep 17 00:00:00 2001 1From b592df2afbbeb0670a9d2939d5cca1544095c7ae Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 Aug 2018 03:23:20 +0000 3Date: Thu, 23 Aug 2018 03:23:20 +0000
4Subject: [PATCH] runtime: Include missing <QCoreApplication> header 4Subject: [PATCH] runtime: Include missing <QCoreApplication> header
@@ -11,17 +11,18 @@ q3dsengine.cpp:1327:9: error: 'QCoreApplication' has not been declared
11 11
12Upstream-Status: Pending 12Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
14--- 15---
15 src/runtime/q3dsengine.cpp | 1 + 16 src/runtime/q3dsengine.cpp | 1 +
16 1 file changed, 1 insertion(+) 17 1 file changed, 1 insertion(+)
17 18
18diff --git a/src/runtime/q3dsengine.cpp b/src/runtime/q3dsengine.cpp 19diff --git a/src/runtime/q3dsengine.cpp b/src/runtime/q3dsengine.cpp
19index 1a438f0..d6d4eb5 100644 20index 053fda4..65c34aa 100644
20--- a/src/runtime/q3dsengine.cpp 21--- a/src/runtime/q3dsengine.cpp
21+++ b/src/runtime/q3dsengine.cpp 22+++ b/src/runtime/q3dsengine.cpp
22@@ -36,6 +36,7 @@ 23@@ -36,6 +36,7 @@
23 #include "q3dsinlineqmlsubpresentation_p.h" 24 #include "q3dsinlineqmlsubpresentation_p.h"
24 #include "q3dsviewersettings.h" 25 #include "q3dsviewportsettings_p.h"
25 26
26+#include <QCoreApplication> 27+#include <QCoreApplication>
27 #include <QLoggingCategory> 28 #include <QLoggingCategory>