summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-12-13 11:27:48 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-12-13 13:47:00 +0000
commitdc5f0b3004a0b5a9624d6695909f9c6d743429bc (patch)
tree6877b5ffdfffbff305b710f833bbedce3a1c98f2 /recipes-qt/qt5/qtwebkit
parentc4a0a450b4275cc3869cf389c92e86b62f09fcea (diff)
downloadmeta-qt5-dc5f0b3004a0b5a9624d6695909f9c6d743429bc.tar.gz
qt5: update submodules
QOpenGLPaintDevice patch doesn't apply anymore, but removed since it adds new API and should be submitted to Qt. Change-Id: I548d61c6f9ffbafc5aa1516e66cae3cf5b0d935f Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit')
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch b/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch
deleted file mode 100644
index b6eabfda..00000000
--- a/recipes-qt/qt5/qtwebkit/0004-Remove-unused-check-for-the-private_headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 6f4746e59c3768a56336f202054ec5498a7d376f Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
3Date: Wed, 14 Sep 2016 23:51:14 +0200
4Subject: [PATCH] Remove unused check for private_tests
5
6It turns out that qt_developer_build is never used anyway.
7
8I did some git archeology and it looks like it was nuked when doing the
95.2 merge from upstream. The original purpose was apparently to control
10-Werror, which is nowadays controlled by CONFIG -= production_build.
11
12This actually fixes the build, as the QT_FOR_CONFIG += core-private which
13would have been required for qtConfig(private_tests) is missing.
14
15Task-number: QTBUG-55950
16Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3
17---
18 Tools/qmake/mkspecs/features/default_pre.prf | 4 ----
19 1 file changed, 4 deletions(-)
20
21diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
22index 6bb52d0..8aa806d 100644
23--- a/Tools/qmake/mkspecs/features/default_pre.prf
24+++ b/Tools/qmake/mkspecs/features/default_pre.prf
25@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL
26 scratchbox: PYTHON = python2.6
27 else: PYTHON = python
28
29-# We use private_tests to detect developer build, since the destdir will
30-# always be our webkit build dir. This might change as configure changes.
31-qtConfig(private_tests): CONFIG += qt_developer_build
32-
33 # By default we enable "production build", and build-webkit, which is
34 # used by bots and developers, will disable it, to enable warnings etc.
35 CONFIG += production_build