From dd3054e8c2e2361a26461e8bcb62394d178ac75e Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Tue, 17 Nov 2020 15:56:26 +0000
Subject: Update qmake to match configuration flag changes

Change-Id: I679c7d96002b1f58c7ae54fd3bfe044e395a0ed4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit c093cad12472b6151e2a3e194202d01568a7588f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/3rdparty/assimp/assimp_dependency.pri |  2 +-
 src/core/configure.json                   | 14 +++++++-------
 src/plugins/sceneparsers/sceneparsers.pro |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
index 8ba2d9a41..de404c184 100644
--- a/src/3rdparty/assimp/assimp_dependency.pri
+++ b/src/3rdparty/assimp/assimp_dependency.pri
@@ -1,5 +1,5 @@
 QT_FOR_CONFIG += 3dcore-private
-qtConfig(system-assimp):!if(cross_compile:host_build) {
+qtConfig(qt3d-system-assimp):!if(cross_compile:host_build) {
     QMAKE_USE_PRIVATE += assimp
 } else {
     include(assimp.pri)
diff --git a/src/core/configure.json b/src/core/configure.json
index 2e13d9027..f3f444b5b 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -8,7 +8,7 @@
 
     "commandline": {
         "options": {
-            "assimp": { "type": "enum", "values": [ "qt", "system", "no" ] },
+            "qt3d-assimp": { "type": "enum", "values": [ "qt", "system", "no" ] },
             "qt3d-profile-jobs": "boolean",
             "qt3d-profile-gl": "boolean",
             "qt3d-render": "boolean",
@@ -21,7 +21,7 @@
     },
 
     "libraries": {
-        "assimp": {
+        "qt3d-assimp": {
             "label": "Assimp",
             "test": "assimp",
             "sources": [
@@ -32,15 +32,15 @@
     },
 
     "features": {
-        "assimp": {
+        "qt3d-assimp": {
             "label": "Assimp",
             "output": [ "privateFeature", "feature" ]
         },
-        "system-assimp": {
+        "qt3d-system-assimp": {
             "label": "System Assimp",
             "enable": "input.assimp == 'system'",
             "disable": "input.assimp == 'qt'",
-            "condition": "features.assimp && libs.assimp",
+            "condition": "features.qt3d-assimp && libs.qt3d-assimp",
             "output": [ "privateFeature" ]
         },
         "qt3d-profile-jobs": {
@@ -110,8 +110,8 @@
         {
             "section": "Qt 3D",
             "entries": [
-                "assimp",
-                "system-assimp",
+                "qt3d-assimp",
+                "qt3d-system-assimp",
                 "qt3d-profile-gl",
                 "qt3d-simd-sse2",
                 "qt3d-simd-avx2",
diff --git a/src/plugins/sceneparsers/sceneparsers.pro b/src/plugins/sceneparsers/sceneparsers.pro
index ee48da565..f2b09f7ea 100644
--- a/src/plugins/sceneparsers/sceneparsers.pro
+++ b/src/plugins/sceneparsers/sceneparsers.pro
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
 # QNX is not supported, and Linux GCC 4.9 on ARM chokes on the assimp
 # sources (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66964).
 QT_FOR_CONFIG += 3dcore-private
-!ios:!tvos:!qcc:qtConfig(assimp):if(qtConfig(system-assimp)|android-clang|clang|win32-msvc):if(gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4)) {
+!ios:!tvos:!qcc:qtConfig(qt3d-assimp):if(qtConfig(qt3d-system-assimp)|android-clang|clang|win32-msvc):if(gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4)) {
     SUBDIRS += assimp
 }
 SUBDIRS += gltf
-- 
cgit v1.2.3