[LyX/2.3.x] Backport QList::fromSet() deprecation warning

Juergen Spitzmueller spitz at lyx.org
Sat Mar 13 11:16:43 UTC 2021


commit 1a3f1506320336a43e71a00be86c094a3c0ddd38
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Sat Mar 13 12:19:38 2021 +0100

    Backport QList::fromSet() deprecation warning
---
 src/frontends/qt4/qt_helpers.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp
index b5cd928..7f8a853 100644
--- a/src/frontends/qt4/qt_helpers.cpp
+++ b/src/frontends/qt4/qt_helpers.cpp
@@ -336,7 +336,11 @@ QStringList texFileList(QString const & filename)
 	}
 
 	// 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)


More information about the lyx-cvs mailing list