From 197ba3e938169f73426c37e969c1529588e2fa26 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Tue, 21 Jul 2020 16:42:11 +0200
Subject: Inline QDir::separator(), as requested by a ### Qt6 comment

Task-number: QTBUG-85700
Change-Id: Icd44e428b607703defb9be1c149db6a564e6b4f0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/corelib/io/qdir.cpp | 10 ++--------
 src/corelib/io/qdir.h   |  9 ++++++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index e202be154a..3e0174e383 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -1969,6 +1969,8 @@ QFileInfoList QDir::drives()
 }
 
 /*!
+    \fn QChar QDir::separator()
+
     Returns the native directory separator: "/" under Unix
     and "\\" under Windows.
 
@@ -1980,14 +1982,6 @@ QFileInfoList QDir::drives()
 
     \sa listSeparator()
 */
-QChar QDir::separator()
-{
-#if defined(Q_OS_WIN)
-    return QLatin1Char('\\');
-#else
-    return QLatin1Char('/');
-#endif
-}
 
 /*!
     \fn QDir::listSeparator()
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index f0dda73ebb..05adb688f8 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -239,7 +239,14 @@ public:
 #endif
     }
 
-    static QChar separator(); // ### Qt6: Make it inline
+    static QChar separator()
+    {
+#if defined(Q_OS_WIN)
+        return QLatin1Char('\\');
+#else
+        return QLatin1Char('/');
+#endif
+    }
 
     static bool setCurrent(const QString &path);
     static inline QDir current() { return QDir(currentPath()); }
-- 
cgit v1.2.3