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

QmakeProjectManager: Work around broken mkspecs

Browse Source 
E.g. linux-oe-g++/qmake.conf has this craziness:
    QMAKE_CXX = arm-poky-linux-gnueabi-g++ -mthumb -mfpu=neon
                -mfloat-abi=hard -mcpu=cortex-a9
                -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat
                -Wformat-security -Werror=format-security
Since there seems to be no hope for a fix, we work around it by looking
for compiler options in the alleged executable names and forwarding them
along with the flags from the actual *FLAGS variables.

Fixes: QTCREATORBUG-28201
Change-Id: Id0651677dd7b444a5f443e63d36e8dec52106af7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-09-22 13:10:48 +02:00
parent 9f71f8b933
commit 049c2cf6f3
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -316,7 +316,6 @@ void QmakeBuildSystem::updateCppCodeModel()
RawProjectParts rpps;
for (const QmakeProFile *pro : rootProFile()->allProFiles()) {
warnOnToolChainMismatch(pro);
RawProjectPart rpp;
rpp.setDisplayName(pro->displayName());
rpp.setProjectFileLocation(pro->filePath().toString());
@@ -334,10 +333,26 @@ void QmakeBuildSystem::updateCppCodeModel()
break;
}
const QString includeFileBaseDir = pro->sourceDir().toString();
rpp.setFlagsForCxx({kitInfo.cxxToolChain, pro->variableValue(Variable::CppFlags),
includeFileBaseDir});
rpp.setFlagsForC({kitInfo.cToolChain, pro->variableValue(Variable::CFlags),
includeFileBaseDir});
QStringList cxxArgs = pro->variableValue(Variable::CppFlags);
QStringList cArgs = pro->variableValue(Variable::CFlags);
// For broken mkspecs, see QTCREATORBUG-28201.
const auto getExtraFlagsFromCompilerVar = [pro](Variable var) {
const QStringList value = pro->variableValue(var);
const int firstOptIndex = Utils::indexOf(value, [](const QString &arg) {
return arg.startsWith('-');
});
if (firstOptIndex <= 0)
return QStringList();
return value.mid(firstOptIndex);
};
const QStringList extraCxxArgs = getExtraFlagsFromCompilerVar(Variable::QmakeCxx);
const QStringList extraCArgs = getExtraFlagsFromCompilerVar(Variable::QmakeCc);
rpp.setFlagsForCxx({kitInfo.cxxToolChain, cxxArgs << extraCxxArgs, includeFileBaseDir});
rpp.setFlagsForC({kitInfo.cToolChain, cArgs << extraCArgs, includeFileBaseDir});
rpp.setMacros(ProjectExplorer::Macro::toMacros(pro->cxxDefines()));
rpp.setPreCompiledHeaders(pro->variableValue(Variable::PrecompiledHeader));
rpp.setSelectedForBuilding(pro->includedInExactParse());