qmljs: (QString -> Utils::FilePath)++

convert more QString containing paths to Utils::FilePath

Change-Id: I1219d7d147993e48cfa641dc9bea72ab38c90f51
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index a0f54fd84b..6640ee2c1c 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -119,11 +119,11 @@ public:
                 if (!url.isValid() && !url.isEmpty()) {
                     setMessage(ErrInvalidUrl);
                 } else {
-                    QString fileName = url.toLocalFile();
+                    Utils::FilePath fileName = Utils::FilePath::fromString(url.toLocalFile());
                     if (!fileName.isEmpty()) {
-                        if (QFileInfo(fileName).isRelative())
-                            fileName = QString("/%1%2").arg(_doc->path(), fileName);
-                        if (!QFileInfo::exists(fileName))
+                        if (fileName.isRelativePath())
+                            fileName = _doc->path().pathAppended(fileName.path());
+                        if (!fileName.exists())
                             setMessage(WarnFileOrDirectoryDoesNotExist);
                     }
                 }
@@ -967,7 +967,7 @@ void Check::visitQmlObject(Node *ast, UiQualifiedId *typeId,
     if (checkTypeForDesignerSupport(typeId))
         addMessage(WarnUnsupportedTypeInVisualDesigner, typeErrorLocation, typeName);
 
-    if (typeId->next == nullptr && QFileInfo(_doc->fileName()).baseName() == typeName)
+    if (typeId->next == nullptr && _doc->fileName().baseName() == typeName)
         addMessage(ErrTypeIsInstantiatedRecursively, typeErrorLocation, typeName);
 
     if (checkTypeForQmlUiSupport(typeId))