From 44a1cc1c2e38cbde5547d8fa7df168fcf5360bc7 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Fri, 6 Sep 2019 12:18:21 +0200
Subject: [PATCH] Move developer build option to tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Iffac4541f5675b0f048080f012b7b81b18885308
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
---
src/buildtools/configure.json | 9 ++++++++-
src/core/configure.json | 7 -------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index a9daad377..8ddff6b2c 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -376,6 +376,12 @@
&& (!config.win32 || features.webengine-winversion)",
"output": [ "privateFeature" ]
},
+ "webengine-developer-build": {
+ "label": "Developer build",
+ "purpose": "Enables the developer build configuration.",
+ "autoDetect": "features.private_tests",
+ "output": [ "privateFeature" ]
+ },
"webengine-python2": {
"label": "python2",
"condition": "tests.webengine-python2",
@@ -404,7 +410,7 @@
"condition": "tests.webengine-ninja",
"output": [ "privateFeature" ]
},
- "webengine-system-fontconfig": {
+ "webengine-system-fontconfig": {
"label": "fontconfig",
"condition": "libs.webengine-fontconfig",
"output": [ "privateFeature" ]
@@ -688,6 +694,7 @@
"message": "Jumbo Build Merge Limit",
"type": "jumboBuild"
},
+ "webengine-developer-build",
{
"section": "Required system libraries",
"condition": "config.unix && !config.macos && features.webengine-core",
diff --git a/src/core/configure.json b/src/core/configure.json
index cf01b9914..41b4b2fbd 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -113,12 +113,6 @@
"autoDetect": "tests.webengine-embedded-build",
"output": [ "privateFeature" ]
},
- "webengine-developer-build": {
- "label": "Developer build",
- "purpose": "Enables the developer build configuration.",
- "autoDetect": "features.private_tests",
- "output": [ "privateFeature" ]
- },
"webengine-alsa": {
"label": "Use ALSA",
"condition": "config.unix && libs.webengine-alsa",
@@ -285,7 +279,6 @@
"condition": "features.webengine-core",
"entries": [
"webengine-embedded-build",
- "webengine-developer-build",
"webengine-full-debug-info",
"webengine-pepper-plugins",
"webengine-printing-and-pdf",
--
GitLab