From 2ed1e0ba423a75f68c1547fe0c06e62e773ef64d Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 24 Oct 2017 18:51:42 +0200
Subject: Add 'webengine' prefix to configure features, tests, libraries, etc

This is done to make sure there are no conflicts with features in
other modules, because they all share a global namespace.

Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 mkspecs/features/configure.prf | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'mkspecs/features/configure.prf')

diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index ed9882735..904e7b1c0 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -30,19 +30,19 @@ defineTest(runConfigure) {
     include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri)
     QT_FOR_CONFIG += webengine-private
 
-    !qtConfig(gperf) {
+    !qtConfig(webengine-gperf) {
         skipBuild("Required gperf could not be found.")
         return(false)
     }
-    !qtConfig(bison) {
+    !qtConfig(webengine-bison) {
         skipBuild("Required bison could not be found.")
         return(false)
     }
-    !qtConfig(flex) {
+    !qtConfig(webengine-flex) {
         skipBuild("Required flex could not be found.")
         return(false)
     }
-    !qtConfig(python2) {
+    !qtConfig(webengine-python2) {
         skipBuild("A suitable version of python2 could not be found.")
         return(false)
     }
@@ -53,28 +53,28 @@ defineTest(runConfigure) {
     }
 
     linux {
-        !qtConfig(system-glibc) {
+        !qtConfig(webengine-system-glibc) {
             skipBuild("A suitable version of libc could not be found. See: https://sourceware.org/bugzilla/show_bug.cgi?id=14898")
             return(false)
         }
 
         QT_FOR_CONFIG += gui-private
 
-        !qtConfig(system-khr) {
+        !qtConfig(webengine-system-khr) {
             skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)")
             return(false)
         }
 
         for(package, $$list("nss dbus fontconfig")) {
-            !qtConfig(system-$$package) {
+            !qtConfig(webengine-system-$$package) {
                 skipBuild("A suitable version of $$package could not be found.")
                 return(false)
             }
          }
 
-        !qtConfig(embedded): qtConfig(xcb) {
+        !qtConfig(webengine-embedded-build): qtConfig(xcb) {
              for(package, $$list("libdrm xcomposite xcursor xi xrandr xtst")) {
-                 !qtConfig(system-$$package) {
+                 !qtConfig(webengine-system-$$package) {
                      skipBuild("A suitable version of $$package could not be found.")
                      return(false)
                  }
-- 
cgit v1.2.3