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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/locator/executefilter.cpp

Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
This commit is contained in:
Eike Ziller
2021-08-11 10:10:51 +02:00
parent 7be290ec59 21cb0711c4
commit c7168d1063
104 changed files with 1405 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
View File

@@ -168,7 +168,7 @@ QString ComponentNameDialog::isValid() const
if (!ui->pathEdit->isValid())
return tr("Invalid path.");
if (QDir(ui->pathEdit->path()).exists(compName + u".qml"))
if (QDir(ui->pathEdit->path()).exists(compName + ".qml"))
return tr("Component already exists.");
return QString();