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

Utils: Introduce a FilePath constructor from char arrays

Browse Source 
Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for
decorations in user code.

At the same time, drop some convenience constructors and functions
in CommandLine and Icon essentially serving the same purpose.

Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-10 16:19:02 +02:00
parent 98cba6e50c
commit 7c28c4f744
109 changed files with 452 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/project.cpp
View File

@@ -1100,7 +1100,7 @@ static Utils::FilePath constructTestPath(const char *basePath)
{
Utils::FilePath drive;
if (Utils::HostOsInfo::isWindowsHost())
drive = Utils::FilePath::fromString("C:");
drive = "C:";
return drive + QLatin1String(basePath);
}
@@ -1304,7 +1304,7 @@ void ProjectExplorerPlugin::testProject_multipleBuildConfigs()
QVERIFY(tempDir->isValid());
QString error;
const FilePath projectDir = FilePath::fromString(tempDir->path() + "/generic-project");
FileUtils::copyRecursively(FilePath::fromString(":/projectexplorer/testdata/generic-project"),
FileUtils::copyRecursively(":/projectexplorer/testdata/generic-project",
projectDir, &error);
QVERIFY2(error.isEmpty(), qPrintable(error));
const QFileInfoList files = QDir(projectDir.toString()).entryInfoList(QDir::Files | QDir::Dirs);