diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0001-Remove-unused-check-for-private_tests.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit/0001-Remove-unused-check-for-private_tests.patch | 41 |
1 files changed, 0 insertions, 41 deletions
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 |