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

CMake: Work around bug in cmake documentation when extracting keywords

Browse Source 
Work around a bug in the documentation of CMAKE_COMPILER_IS_GNU*, which
leads to creator offering invalid completion when editing CMakeLists.txt
files.

Task-number: QTCREATORBUG-16852
Change-Id: I7c61445a7448bdd6f5de5f235316c260ba28e757
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-09-14 12:28:14 +02:00
parent b57f20f633
commit 9dda516b08
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -318,7 +318,9 @@ QStringList CMakeTool::parseVariableOutput(const QString &output)
const QStringList variableList = output.split(QLatin1Char('\n')); const QStringList variableList = output.split(QLatin1Char('\n'));
QStringList result; QStringList result;
foreach (const QString &v, variableList) { foreach (const QString &v, variableList) {
if (v.contains("<CONFIG>")) { if (v.startsWith("CMAKE_COMPILER_IS_GNU<LANG>")) { // This key takes a compiler name :-/
result << "CMAKE_COMPILER_IS_GNUCC" << "CMAKE_COMPILER_IS_GNUCXX";
} else if (v.contains("<CONFIG>")) {
const QString tmp = QString(v).replace("<CONFIG>", "%1"); const QString tmp = QString(v).replace("<CONFIG>", "%1");
result << tmp.arg("DEBUG") << tmp.arg("RELEASE") result << tmp.arg("DEBUG") << tmp.arg("RELEASE")
<< tmp.arg("MINSIZEREL") << tmp.arg("RELWITHDEBINFO"); << tmp.arg("MINSIZEREL") << tmp.arg("RELWITHDEBINFO");