diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-22 16:50:47 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-23 19:40:35 +0000 |
| commit | bd9d830eb1eef7a8e9c41cba43723b46bb20e7bf (patch) | |
| tree | 9d7f6ff1a82489be15c3642e6533555a25690196 | |
| parent | 44f4fc3a07d810a227249307e38acff7fba059c4 (diff) | |
qt3d-runtime: drop patch resolved upstream
* resolved in upstream commit:
commit 5651638d8a9d45af8ea6cdc71dc9b8b843103d2b
Author: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri Oct 19 12:11:02 2018 +0300
Add missing include header
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch | 29 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt3d-runtime_git.bb | 2 |
2 files changed, 0 insertions, 31 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 bc61e538..00000000 --- a/recipes-qt/qt5/qt3d-runtime/0001-runtime-Include-missing-QCoreApplication-header.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e6247a6823d372cc779934cf6c74d65bae9652b5 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 1a438f0..d6d4eb5 100644 ---- a/src/runtime/q3dsengine.cpp -+++ b/src/runtime/q3dsengine.cpp -@@ -36,6 +36,7 @@ - #include "q3dsinlineqmlsubpresentation_p.h" - #include "q3dsviewersettings.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 2b017106..8df143ae 100644 --- a/recipes-qt/qt5/qt3d-runtime_git.bb +++ b/recipes-qt/qt5/qt3d-runtime_git.bb @@ -7,8 +7,6 @@ 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.2" |