#10571 improved handling of WM's signal when switching from or to full-screen window

[features.git] / src / frontends / qt / qt_helpers.cpp

diff --git a/src/frontends/qt/qt_helpers.cpp b/src/frontends/qt/qt_helpers.cpp
index 0311b8b25f45e6f0a8b1852fe14f6553615e12e8..26c0df0ffcc5b6a6d5dea06339521b4822bdd448 100644 (file)
--- a/src/frontends/qt/qt_helpers.cpp
+++ b/src/frontends/qt/qt_helpers.cpp
@@ -335,8 +335,12 @@ QStringList texFileList(QString const & filename)
                        set.insert(qfile);
        }
 
-       // remove duplicates
-       return QList<QString>::fromSet(set);
+        // remove duplicates
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+        return QList<QString>(set.begin(), set.end());
+#else
+        return QList<QString>::fromSet(set);
+#endif
 }
 
 QString const externalLineEnding(docstring const & str)
@@ -426,7 +430,7 @@ QString makeAbsPath(QString const & relpath, QString const & base)
 
 /** Given a string such as
  *      "<glob> <glob> ... *.{abc,def} <glob>",
- *  convert the csh-style brace expresions:
+ *  convert the csh-style brace expressions:
  *      "<glob> <glob> ... *.abc *.def <glob>".
  *  Requires no system support, so should work equally on Unix, Mac, Win32.
  */