From 98589279cd63f3482e50b9847432281d77efca5e Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 7 Aug 2024 16:54:34 +0200 Subject: [PATCH] Fix qbs build Change-Id: I1d0d14adf12dbae0014f6b852a29c1eab942be3d Reviewed-by: Christian Stenger --- qbs/modules/qtc/qtc.qbs | 1 + .../qmlprojectmanager/buildsystem/projectitem/converters.cpp | 5 +++-- src/plugins/qmlprojectmanager/qmlprojectmanager.qbs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 5a0e70fae0e..887eea5d18c 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -78,6 +78,7 @@ Module { property stringList generalDefines: [ "QT_CREATOR", + 'IDE_APP_ID="org.qt-project.qtcreator"', 'IDE_LIBRARY_BASENAME="' + libDirName + '"', 'RELATIVE_PLUGIN_PATH="' + FileInfo.relativePath('/' + ide_bin_path, '/' + ide_plugin_path) + '"', diff --git a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp index e98a8446091..60bfe256809 100644 --- a/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp +++ b/src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp @@ -2,8 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "converters.h" -#include "utils/algorithm.h" -#include "cmakegen/filetypes.h" +#include "../../cmakegen/filetypes.h" + +#include #include diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs index b723fe4a4c1..67c6eaf45f6 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs @@ -50,7 +50,7 @@ QtcPlugin { "cmakegenerator.cpp", "cmakegenerator.h", "cmakewriter.cpp", "cmakewriter.h", "cmakewriterv0.cpp", "cmakewriterv0.h", - "cmakewriterv1.cpp", "cmakewriterv1.h" + "cmakewriterv1.cpp", "cmakewriterv1.h", "filetypes.cpp", "filetypes.h" ] }