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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Change-Id: I9d25a7ac39b3619856fc8d8a6be6f91a403b3969
This commit is contained in:
Eike Ziller
2021-09-30 09:03:12 +02:00
parent 050af56000 f2a157897f
commit 19abb9f877
77 changed files with 1058 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/baseprojectwizarddialog.cpp
View File

@@ -64,7 +64,7 @@ BaseProjectWizardDialog::BaseProjectWizardDialog(const Core::BaseFileWizardFacto
Core::BaseFileWizard(factory, parameters.extraValues(), parent),
d(std::make_unique<BaseProjectWizardDialogPrivate>(new ProjectIntroPage))
{
setFilePath(FilePath::fromString(parameters.defaultPath()));
setFilePath(parameters.defaultPath());
setSelectedPlatform(parameters.selectedPlatform());
setRequiredFeatures(parameters.requiredFeatures());
init();
@@ -77,7 +77,7 @@ BaseProjectWizardDialog::BaseProjectWizardDialog(const Core::BaseFileWizardFacto
Core::BaseFileWizard(factory, parameters.extraValues(), parent),
d(std::make_unique<BaseProjectWizardDialogPrivate>(introPage, introId))
{
setFilePath(FilePath::fromString(parameters.defaultPath()));
setFilePath(parameters.defaultPath());
setSelectedPlatform(parameters.selectedPlatform());
setRequiredFeatures(parameters.requiredFeatures());
init();
@@ -157,9 +157,9 @@ ProjectIntroPage *BaseProjectWizardDialog::introPage() const
return d->introPage;
}
QString BaseProjectWizardDialog::uniqueProjectName(const QString &path)
QString BaseProjectWizardDialog::uniqueProjectName(const FilePath &path)
{
const QDir pathDir(path);
const QDir pathDir(path.toString());
//: File path suggestion for a new project. If you choose
//: to translate it, make sure it is a valid path name without blanks
//: and using only ascii chars.