Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: If36d96c0fef3de5ab6503977501c55c62a2ecc97

2 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index dc46695f80..09d2e194ba 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2693,7 +2693,7 @@ QStringList QCoreApplication::libraryPathsLocked()
 
         auto setPathsFromEnv = [&](QString libPathEnv) {
             if (!libPathEnv.isEmpty()) {
-                QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
+                QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts);
                 for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
                     QString canonicalPath = QDir(*it).canonicalPath();
                     if (!canonicalPath.isEmpty()
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index da4d98955d..c81f958e74 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -718,7 +718,7 @@ QMetaType &QMetaType::operator=(const QMetaType &other)
     \relates QMetaType
     \overload
 
-    Returns \c true if the QMetaType \a a represents a difference type
+    Returns \c true if the QMetaType \a a represents a different type
     than the QMetaType \a b, otherwise returns \c false.
 */
 
@@ -1750,7 +1750,7 @@ static QtPrivate::QMetaTypeInterface *interfaceForType(int typeId)
 
      Constructs a QMetaType object that contains all information about type \a typeId.
 
-     \note: The default parameter was added in Qt 5.15
+     \note The default parameter was added in Qt 5.15.
 */
 QMetaType::QMetaType(int typeId) : QMetaType(interfaceForType(typeId)) {}