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

CppEditor: Add another exception for using toolchain defines

Browse Source 
If we ignore the emscripten built-in defines, e.g. Q_OS_WASM will not be
set.

Change-Id: Ia2770b8a50a33b695040a19f1cabd62d0d86fdb6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Kandeler
2025-06-12 13:17:55 +02:00
parent 556b202ade
commit 5730f13a74
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cppeditor/compileroptionsbuilder.cpp
View File

@@ -19,6 +19,8 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
#include <webassembly/webassemblyconstants.h>
#include <QDir> #include <QDir>
#include <QRegularExpression> #include <QRegularExpression>
#include <QtGlobal> #include <QtGlobal>
@@ -418,6 +420,7 @@ void CompilerOptionsBuilder::addProjectMacros()
if (m_projectPart.toolchainType == ProjectExplorer::Constants::CUSTOM_TOOLCHAIN_TYPEID if (m_projectPart.toolchainType == ProjectExplorer::Constants::CUSTOM_TOOLCHAIN_TYPEID
|| m_projectPart.toolchainType == Qnx::Constants::QNX_TOOLCHAIN_ID || m_projectPart.toolchainType == Qnx::Constants::QNX_TOOLCHAIN_ID
|| m_projectPart.toolchainType == WebAssembly::Constants::WEBASSEMBLY_TOOLCHAIN_TYPEID
|| m_projectPart.toolchainType.name().contains("BareMetal") || useMacros) { || m_projectPart.toolchainType.name().contains("BareMetal") || useMacros) {
addMacros(m_projectPart.toolchainMacros); addMacros(m_projectPart.toolchainMacros);
} }