From d9005be8a294e565ea55f131d47131a9dbaf47a3 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Fri, 29 Apr 2022 13:48:36 +0200
Subject: [PATCH] Utils: Use new mimetypes implementation when using qbs

It is default for the cmake build, so switch for qbs as well.

Change-Id: Icb325c58e587ecee2c621bf68c191869520e963a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/libs/utils/utils.qbs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 24143c9d243..d23fdc91289 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -5,7 +5,9 @@ Project {
     name: "Utils"
 
     QtcLibrary {
-        cpp.includePaths: base.concat("mimetypes", ".")
+        property bool useNewMimeDatabase: true
+
+        cpp.includePaths: base.concat((useNewMimeDatabase ? "mimetypes2" : "mimetypes"), ".")
         cpp.defines: base.concat([
             "UTILS_LIBRARY"
         ])
@@ -394,7 +396,7 @@ Project {
 
         Group {
             name: "MimeTypes"
-            prefix: "mimetypes/"
+            prefix: useNewMimeDatabase ? "mimetypes2/" : "mimetypes/"
             files: [
                 "mimedatabase.cpp",
                 "mimedatabase.h",
@@ -439,7 +441,8 @@ Project {
 
         Export {
             Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
-            cpp.includePaths: base.concat("mimetypes")
+            cpp.includePaths: base.concat(exportingProduct.useNewMimeDatabase ? "mimetypes2"
+                                                                              : "mimetypes")
         }
     }
 }