qt3d-runtime: update to v2.2

Task-number: QT3DS-2852
Change-Id: I3fdc123fa04507ced98978667b92973b8d5f5593
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

2 files changed, 3 insertions, 35 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
deleted file mode 100644
index 4a4505a1..00000000
--- a/recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b592df2afbbeb0670a9d2939d5cca1544095c7ae Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 23 Aug 2018 03:23:20 +0000
-Subject: [PATCH] runtime: Include missing <QCoreApplication> header
-
-Fixes following errors seen on mips
-
-q3dsengine.cpp:1327:9: error: 'QCoreApplication' has not been declared
-         QCoreApplication::sendEvent(&m_profileUiEventSource, e);
-         ^~~~~~~~~~~~~~~~
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- src/runtime/q3dsengine.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/runtime/q3dsengine.cpp b/src/runtime/q3dsengine.cpp
-index 053fda4..65c34aa 100644
---- a/src/runtime/q3dsengine.cpp
-+++ b/src/runtime/q3dsengine.cpp
-@@ -36,6 +36,7 @@
- #include "q3dsinlineqmlsubpresentation_p.h"
- #include "q3dsviewportsettings_p.h"
- 
-+#include <QCoreApplication>
- #include <QLoggingCategory>
- #include <QKeyEvent>
- #include <QMouseEvent>
diff --git a/recipes-qt/qt5/qt3d-runtime_git.bb b/recipes-qt/qt5/qt3d-runtime_git.bb
index f811d226..8df143ae 100644
--- a/recipes-qt/qt5/qt3d-runtime_git.bb
+++ b/recipes-qt/qt5/qt3d-runtime_git.bb
@@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
 "
 
-SRC_URI += "file://0001-runtime-Include-missing-QCoreApplication-header.patch"
-
 DEPENDS += "qtbase qtdeclarative qt3d"
 
-QT_MODULE_BRANCH = "2.1"
+QT_MODULE_BRANCH = "2.2"
 QT_GIT_PROJECT = "qt3dstudio"
-PV = "2.1+git${SRCPV}"
+PV = "2.2+git${SRCPV}"
 
-SRCREV = "95942f6b187c5272074c191424a18e33f8516967"
+SRCREV = "8cdb99c910f2f57972b652c3fb8d520ba615f110"