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

2
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -755,7 +755,7 @@ void CMakeBuildSystem::handleParsingSucceeded()
checkAndReportError(errorMessage);
}
m_ctestPath = m_reader.ctestPath();
m_ctestPath = FilePath::fromString(m_reader.ctestPath());
setApplicationTargets(appTargets());
setDeploymentData(deploymentData());

2
src/plugins/cmakeprojectmanager/cmakebuildsystem.h
View File

@@ -180,7 +180,7 @@ private:
mutable bool m_isHandlingError = false;
// CTest integration
QString m_ctestPath;
Utils::FilePath m_ctestPath;
QList<ProjectExplorer::TestCaseInfo> m_testNames;
Utils::FutureSynchronizer m_futureSynchronizer;
};

6
src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
View File

@@ -85,9 +85,9 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools()
}
if (HostOsInfo::isMacHost()) {
path.append(FilePath::fromString("/Applications/CMake.app/Contents/bin"));
path.append(FilePath::fromString("/usr/local/bin"));
path.append(FilePath::fromString("/opt/local/bin"));
path.append("/Applications/CMake.app/Contents/bin");
path.append("/usr/local/bin");
path.append("/opt/local/bin");
}
const QStringList execs = env.appendExeExtensions(QLatin1String("cmake"));