summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch')
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch
deleted file mode 100644
index 8200fb9f9060..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8c1a4841174a90299ba2e2851b4d9e79da3b9b25 Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev <kirill.burtsev@qt.io>
-Date: Fri, 6 Mar 2020 17:38:45 +0100
-Subject: [PATCH] Support build with system ninja >= 1.10.0
-
-Fixes: QTBUG-82715
-Change-Id: I9a269efa20d092f75a8a43cb20d1e0dc0f46b9f9
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- configure.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.pri b/configure.pri
-index 3a144e3f8e..3cfce71e03 100644
---- a/configure.pri
-+++ b/configure.pri
-@@ -163,7 +163,7 @@ defineTest(qtConfTest_detectNinja) {
- !isEmpty(ninja) {
- qtLog("Found ninja from path: $$ninja")
- qtRunLoggedCommand("$$ninja --version", version)|return(false)
-- contains(version, "1.[7-9].*"): return(true)
-+ contains(version, "1\.([7-9]|1[0-9])\..*"): return(true)
- qtLog("Ninja version too old")
- }
- qtLog("Building own ninja")
---
-2.16.3