FIXUP: Fix platforms check for topLevel build

In case of a top level build configure.pri is not able
to load platform.prf. Move platform.prf to platfrom.pri
and use include instead. Fix not loaded qconfig.pri
with gcc versions. Make sure there is no function name
collision.

Change-Id: I2c9994197dc56371fd7ef215ab350aebb89ff701
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 3 insertions, 4 deletions

diff --git a/configure.pri b/configure.pri
index 0bf4ca41a..3d6d991ba 100644
--- a/configure.pri
+++ b/configure.pri
@@ -1,5 +1,4 @@
-load(platform)
-
+include(src/buildtools/config/platform.pri)
 include(src/buildtools/config/functions.pri)
 
 # this must be done outside any function
@@ -104,7 +103,7 @@ defineTest(qtConfTest_detectBison) {
 }
 
 defineTest(qtConfTest_detectPlatform) {
-   !isPlatformSupported() {
+   !qtwebengine_isPlatformSupported() {
         qtLog("Platform not supported".)
         return(false)
    }
@@ -112,7 +111,7 @@ defineTest(qtConfTest_detectPlatform) {
 }
 
 defineTest(qtConfTest_detectArch) {
-   !isArchSupported() {
+   !qtwebengine_isArchSupported() {
         qtLog("Architecture not supported".)
         return(false)
    }