qtwebkit: use the last released version

Version in dev branch was never supported and 5.9 was last supported release.

Change-Id: Iffee63bb450c003e27f09dc6a9c0a7e5adca9f91
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

3 files changed, 2 insertions, 44 deletions

diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index b8b6ee71..3e3e4a0b 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
 RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
 
-SRCREV = "7efef7478b60f6aeb7babb0663234cf8dcb8a265"
+SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"
diff --git a/recipes-qt/qt5/qtwebkit/0001-Remove-unused-check-for-private_tests.patch b/recipes-qt/qt5/qtwebkit/0001-Remove-unused-check-for-private_tests.patch
deleted file mode 100644
index 0df47a4f..00000000
--- a/recipes-qt/qt5/qtwebkit/0001-Remove-unused-check-for-private_tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
-Date: Wed, 14 Sep 2016 23:51:14 +0200
-Subject: [PATCH] Remove unused check for private_tests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It turns out that qt_developer_build is never used anyway.
-
-I did some git archeology and it looks like it was nuked when doing the
-5.2 merge from upstream. The original purpose was apparently to control
--Werror, which is nowadays controlled by CONFIG -= production_build.
-
-This actually fixes the build, as the QT_FOR_CONFIG += core-private which
-would have been required for qtConfig(private_tests) is missing.
-
-Task-number: QTBUG-55950
-Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
-Reviewed-by: Jan Kundrát <jkt@kde.org>
----
- Tools/qmake/mkspecs/features/default_pre.prf | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
-index 568e80a..5c36e93 100644
---- a/Tools/qmake/mkspecs/features/default_pre.prf
-+++ b/Tools/qmake/mkspecs/features/default_pre.prf
-@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL
- scratchbox: PYTHON = python2.6
- else: PYTHON = python
- 
--# We use private_tests to detect developer build, since the destdir will
--# always be our webkit build dir. This might change as configure changes.
--qtConfig(private_tests): CONFIG += qt_developer_build
--
- # By default we enable "production build", and build-webkit, which is
- # used by bots and developers, will disable it, to enable warnings etc.
- CONFIG += production_build
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 9fc931e9..8b3c3f50 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -22,7 +22,6 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 # 5.9.meta-qt5.2
 SRC_URI += "\
     file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
-    file://0001-Remove-unused-check-for-private_tests.patch \
     file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \
 "
 
@@ -88,4 +87,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
 
-SRCREV = "7e104c57a70fdf551bb3d22a5d637cdcbc69dbea"
+SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"