Move arm-thumb feature to buildtools

Share arm-thumb setting between pdf and webengine.
Move webengine-embedded to webengine since it is not used
by pdf.

Change-Id: Id23888423af7a37a3b3aa06e40dc0359fb90724b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 14 insertions, 14 deletions

diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
index 297555ac6..56c18bdb5 100644
--- a/src/buildtools/config/linux.pri
+++ b/src/buildtools/config/linux.pri
@@ -24,10 +24,6 @@ gn_args += \
     ozone_platform=\"qt\" \
     ozone_extra_path=\"$$QTWEBENGINE_ROOT/src/core/ozone/ozone_extra.gni\"
 
-qtConfig(build-qtwebengine-core):qtConfig(webengine-embedded-build) {
-    gn_args += is_desktop_linux=false
-}
-
 use_gold_linker: gn_args += use_gold=true
 else: gn_args += use_gold=false
 
@@ -90,7 +86,7 @@ contains(QT_ARCH, "arm") {
         }
     }
 
-    qtConfig(build-qtwebengine-core):qtConfig(webengine-arm-thumb) {
+    qtConfig(webengine-arm-thumb) {
         gn_args += arm_use_thumb=true # this adds -mthumb
     } else {
         gn_args += arm_use_thumb=false
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index f9d4900ba..135e0efce 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -344,6 +344,10 @@
         "webengine-nowhitespace" : {
             "label": "build path without whitespace",
             "type": "detectNoWhitespace"
+        },
+        "webengine-arm-thumb" : {
+            "label": "thumb instruction set",
+            "type": "hasThumbFlag"
         }
     },
     "features": {
@@ -649,6 +653,11 @@
                 "privateFeature",
                 { "type": "varAssign", "name": "PLATFORM_ERROR", "value": "tests.webengine-platform-support.platformSupport" }
             ]
+        },
+        "webengine-arm-thumb": {
+            "label": "Thumb instruction set",
+            "condition": "config.linux && arch.arm && tests.webengine-arm-thumb",
+            "output": [ "privateFeature" ]
         }
     },
     "report": [
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index f890f0a6c..e98524002 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -1,5 +1,9 @@
 include(common.pri)
 
+qtConfig(webengine-embedded-build) {
+    gn_args += is_desktop_linux=false
+}
+
 !host_build{
 
 
diff --git a/src/core/configure.json b/src/core/configure.json
index 167555d79..e0de69b10 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -89,10 +89,6 @@
             "label" : "sanitizer support",
             "type": "isSanitizerSupported"
         },
-        "webengine-arm-thumb" : {
-            "label": "thumb instruction set",
-            "type": "hasThumbFlag"
-        },
         "webengine-noexecstack" : {
             "label": "linker supports -z noexecstack",
             "type": "linkerSupportsFlag",
@@ -204,11 +200,6 @@
             "condition": "libs.webengine-poppler-cpp",
             "output": [ "privateFeature" ]
         },
-        "webengine-arm-thumb": {
-            "label": "Thumb instruction set",
-            "condition": "config.linux && features.webengine-embedded-build && arch.arm && tests.webengine-arm-thumb",
-            "output": [ "privateFeature" ]
-        },
         "webengine-full-debug-info": {
             "label": "Full debug information",
             "purpose": "Enables debug information for Blink and V8.",