feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Use new mimetypes implementation when using qbs

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

Change-Id: Icb325c58e587ecee2c621bf68c191869520e963a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2022-04-29 13:48:36 +02:00
parent 5019513efc
commit d9005be8a2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/utils.qbs
View File

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