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

5
src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp
View File

@@ -56,7 +56,7 @@ void LocalQmlProfilerRunnerTest::testRunner()
int runCount = 0;
int stopCount = 0;
debuggee.command.setExecutable(Utils::FilePath::fromString("\\-/|\\-/"));
debuggee.command.setExecutable("\\-/|\\-/");
debuggee.environment = Utils::Environment::systemEnvironment();
// should not be used anywhere but cannot be empty
@@ -110,7 +110,8 @@ void LocalQmlProfilerRunnerTest::testRunner()
serverUrl = Utils::urlFromLocalSocket();
// comma is used to specify a test function. In this case, an invalid one.
debuggee.command = Utils::CommandLine(QCoreApplication::applicationFilePath(), {"-test", "QmlProfiler,"});
debuggee.command = Utils::CommandLine(Utils::FilePath::fromString(QCoreApplication::applicationFilePath()),
{"-test", "QmlProfiler,"});
runControl = new ProjectExplorer::RunControl(ProjectExplorer::Constants::QML_PROFILER_RUN_MODE);
runControl->setRunnable(debuggee);
profiler = new LocalQmlProfilerSupport(runControl, serverUrl);

8
src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp
View File

@@ -178,10 +178,9 @@ void QmlProfilerDetailsRewriterTest::testPopulateFileFinder()
QCOMPARE(m_rewriter.getLocalFile("Test.qml"), QString());
// Test that the rewriter will populate from available projects if given nullptr as parameter.
DummyProject *project1 = new DummyProject(Utils::FilePath::fromString(":/nix.nix"));
DummyProject *project1 = new DummyProject(":/nix.nix");
ProjectExplorer::SessionManager::addProject(project1);
DummyProject *project2 = new DummyProject(
Utils::FilePath::fromString(":/qmlprofiler/tests/Test.qml"));
DummyProject *project2 = new DummyProject(":/qmlprofiler/tests/Test.qml");
ProjectExplorer::SessionManager::addProject(project2);
m_rewriter.populateFileFinder(nullptr);
QCOMPARE(m_rewriter.getLocalFile("Test.qml"),
@@ -216,8 +215,7 @@ void QmlProfilerDetailsRewriterTest::seedRewriter()
QVERIFY(!doc->source().isEmpty());
auto kit = std::make_unique<ProjectExplorer::Kit>();
ProjectExplorer::SysRootKitAspect::setSysRoot(
kit.get(), Utils::FilePath::fromString("/nowhere"));
ProjectExplorer::SysRootKitAspect::setSysRoot(kit.get(), "/nowhere");
DummyProject *project = new DummyProject(Utils::FilePath::fromString(filename));
ProjectExplorer::SessionManager::addProject(project);