summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-08-30 08:53:20 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-08-30 06:09:42 +0000
commit545a669f01badfba6f4e2bc1e464f3edfb046034 (patch)
tree68c87bdad692f110d68e772375b9c6ee614be8a2
parent2859a6148e3a233f42c8e7256cc0a0d05ed9425e (diff)
downloadmeta-qt5-545a669f01badfba6f4e2bc1e464f3edfb046034.tar.gz
qtwebview: remove obsolete patch
Change-Id: Ifcc5569498cdb51cb88394313d8d1e9caaea3d68 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch22
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
2 files changed, 0 insertions, 24 deletions
diff --git a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
deleted file mode 100644
index 82087b9a..00000000
--- a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 2 Jun 2017 13:12:18 +0300
4Subject: [PATCH] Add missing include for qWarning
5
6Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439
7---
8 src/webview/qquickwebview.cpp | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp
12index d760564..fbbbfd6 100644
13--- a/src/webview/qquickwebview.cpp
14+++ b/src/webview/qquickwebview.cpp
15@@ -39,6 +39,7 @@
16 #include <QtWebView/private/qwebviewloadrequest_p.h>
17 #include <QtQml/qqmlengine.h>
18 #include <QtCore/qmutex.h>
19+#include <QtCore/QDebug>
20
21 namespace {
22
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 74d15fb6..6d27a419 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = " \
9require qt5.inc 9require qt5.inc
10require qt5-git.inc 10require qt5-git.inc
11 11
12SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
13
14DEPENDS += "qtbase qtwebengine" 12DEPENDS += "qtbase qtwebengine"
15 13
16SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d" 14SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d"