2 files changed, 11 insertions, 7 deletions
diff --git a/src/widgets/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp
index 95e6a1840d..5526da8509 100644
--- a/src/widgets/itemviews/qdirmodel.cpp
+++ b/src/widgets/itemviews/qdirmodel.cpp
@@ -52,6 +52,7 @@
 #include <qstyle.h>
 #include <qapplication.h>
 #include <private/qabstractitemmodel_p.h>
+#include <private/qfilesystementry_p.h>
 #include <qdebug.h>
 
 #include <stack>
@@ -1104,8 +1105,9 @@ QString QDirModel::fileName(const QModelIndex &index) const
     if (!d->indexValid(index))
         return QString();
     QFileInfo info = fileInfo(index);
-    if (info.isRoot())
-        return info.absoluteFilePath();
+    const QString &path = info.absoluteFilePath();
+    if (QFileSystemEntry::isRootPath(path))
+        return path;
     if (d->resolveSymlinks && info.isSymLink())
         info = d->resolvedInfo(info);
     return info.fileName();
@@ -1280,8 +1282,8 @@ QString QDirModelPrivate::name(const QModelIndex &index) const
 {
     const QDirNode *n = node(index);
     const QFileInfo info = n->info;
-    if (info.isRoot()) {
-        QString name = info.absoluteFilePath();
+    QString name = info.absoluteFilePath();
+    if (QFileSystemEntry::isRootPath(name)) {
 #if defined(Q_OS_WIN)
         if (name.startsWith(QLatin1Char('/'))) // UNC host
             return info.fileName();
diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp
index 8c3cf3859e..65ae6b9505 100644
--- a/src/widgets/itemviews/qfileiconprovider.cpp
+++ b/src/widgets/itemviews/qfileiconprovider.cpp
@@ -46,6 +46,7 @@
 #include <private/qfunctions_p.h>
 #include <private/qguiapplication_p.h>
 #include <private/qicon_p.h>
+#include <private/qfilesystementry_p.h>
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformservices.h>
 #include <qpa/qplatformtheme.h>
@@ -247,10 +248,11 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const
     if (!retIcon.isNull())
         return retIcon;
 
-    if (info.isRoot())
+    const QString &path = info.absoluteFilePath();
+    if (path.isEmpty() || QFileSystemEntry::isRootPath(path))
 #if defined (Q_OS_WIN) && !defined(Q_OS_WINRT)
     {
-        UINT type = GetDriveType((wchar_t *)info.absoluteFilePath().utf16());
+        UINT type = GetDriveType(reinterpret_cast<const wchar_t *>(path.utf16()));
 
         switch (type) {
         case DRIVE_REMOVABLE:
@@ -298,7 +300,7 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const
 
 QString QFileIconProvider::type(const QFileInfo &info) const
 {
-    if (info.isRoot())
+    if (QFileSystemEntry::isRootPath(info.absoluteFilePath()))
         return QApplication::translate("QFileDialog", "Drive");
     if (info.isFile()) {
         if (!info.suffix().isEmpty()) {