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

ProjectExplorer: Use FilePath for sysroots

Browse Source 
... and reduce to the relevant part when passing to cmake.

Task-number: QTCREATORBUG-27229
Change-Id: I7cde2ff04530caf439d6707c2c6d15a8e734ae0b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2022-06-30 09:08:47 +02:00
parent c294df1d3a
commit 3be472c8d2
15 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp
View File

@@ -45,6 +45,7 @@
using namespace CppEditor;
using namespace ProjectExplorer;
using namespace Utils;
namespace CompilationDatabaseProjectManager {
namespace Internal {
@@ -124,7 +125,7 @@ public:
QStringList flags;
QString fileName;
QString workingDir;
QString sysRoot;
FilePath sysRoot;
};
}
@@ -183,8 +184,8 @@ void CompilationDatabaseTests::testFilterArguments()
{"RELATIVE_PLUGIN_PATH", "\"../lib/qtcreator/plugins\""},
{"QT_CREATOR", "1"}}));
QCOMPARE(testData.fileKind, CppEditor::ProjectFile::Kind::CXXSource);
QCOMPARE(testData.sysRoot, HostOsInfo::isWindowsHost() ? QString("C:\\sysroot\\embedded")
: QString("/opt/sysroot/embedded"));
QCOMPARE(testData.sysRoot.toString(), HostOsInfo::isWindowsHost() ? QString("C:\\sysroot\\embedded")
: QString("/opt/sysroot/embedded"));
}
static QString kCmakeCommand

5
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp
View File

@@ -38,6 +38,7 @@
#include <QSet>
using namespace ProjectExplorer;
using namespace Utils;
namespace CompilationDatabaseProjectManager {
namespace Internal {
@@ -102,7 +103,7 @@ void filteredFlags(const QString &fileName,
HeaderPaths &headerPaths,
Macros &macros,
CppEditor::ProjectFile::Kind &fileKind,
QString &sysRoot)
Utils::FilePath &sysRoot)
{
if (flags.empty())
return;
@@ -192,7 +193,7 @@ void filteredFlags(const QString &fileName,
if (flag.startsWith("--sysroot=")) {
if (sysRoot.isEmpty())
sysRoot = updatedPathFlag(flag.mid(10), workingDir);
sysRoot = FilePath::fromString(updatedPathFlag(flag.mid(10), workingDir));
continue;
}

6
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.h
View File

@@ -25,10 +25,8 @@
#pragma once
#include "compilationdatabaseconstants.h"
#include <cppeditor/cppprojectfile.h>
#include <utils/fileutils.h>
#include <utils/filepath.h>
#include <QHash>
#include <QStringList>
@@ -65,7 +63,7 @@ void filteredFlags(const QString &fileName,
QVector<ProjectExplorer::HeaderPath> &headerPaths,
QVector<ProjectExplorer::Macro> &macros,
CppEditor::ProjectFile::Kind &fileKind,
QString &sysRoot);
Utils::FilePath &sysRoot);
QStringList splitCommandLine(QString commandLine, QSet<QString> &flagsCache);

2
src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
View File

@@ -25,6 +25,8 @@
#include "compilationdbparser.h"
#include "compilationdatabaseconstants.h"
#include <coreplugin/progressmanager/progressmanager.h>
#include <projectexplorer/task.h>
#include <projectexplorer/treescanner.h>