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

Fix qbs build

Browse Source 
Change-Id: I1d0d14adf12dbae0014f6b852a29c1eab942be3d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2024-08-07 16:54:34 +02:00
committed by Christian Stenger
parent 7c7c6123d6
commit 98589279cd
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qbs/modules/qtc/qtc.qbs
View File

@@ -78,6 +78,7 @@ Module {
property stringList generalDefines: [ property stringList generalDefines: [
"QT_CREATOR", "QT_CREATOR",
'IDE_APP_ID="org.qt-project.qtcreator"',
'IDE_LIBRARY_BASENAME="' + libDirName + '"', 'IDE_LIBRARY_BASENAME="' + libDirName + '"',
'RELATIVE_PLUGIN_PATH="' + FileInfo.relativePath('/' + ide_bin_path, 'RELATIVE_PLUGIN_PATH="' + FileInfo.relativePath('/' + ide_bin_path,
'/' + ide_plugin_path) + '"', '/' + ide_plugin_path) + '"',

5
src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
View File

@@ -2,8 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "converters.h" #include "converters.h"
#include "utils/algorithm.h" #include "../../cmakegen/filetypes.h"
#include "cmakegen/filetypes.h"
#include <utils/algorithm.h>
#include <QJsonDocument> #include <QJsonDocument>

2
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
View File

@@ -50,7 +50,7 @@ QtcPlugin {
"cmakegenerator.cpp", "cmakegenerator.h", "cmakegenerator.cpp", "cmakegenerator.h",
"cmakewriter.cpp", "cmakewriter.h", "cmakewriter.cpp", "cmakewriter.h",
"cmakewriterv0.cpp", "cmakewriterv0.h", "cmakewriterv0.cpp", "cmakewriterv0.h",
"cmakewriterv1.cpp", "cmakewriterv1.h" "cmakewriterv1.cpp", "cmakewriterv1.h",
"filetypes.cpp", "filetypes.h" "filetypes.cpp", "filetypes.h"
] ]
} }