anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt deprecation warn for QList::fromSet()

Browse Source 
Fix the following warning from Qt 5.14.1:

  error: ‘static QList<T> QList<T>::fromSet(const QSet<T>&) [with T = QString]’ is deprecated: Use QList<T>(set.begin(), set.end()) instead. [-Werror=deprecated-declarations]

Regarding QList::fromSet(), the documentation now states the
following [1]:

  Since Qt 5.14, range constructors are available for Qt's generic
  container classes and should be used in place of this method.

[1] https://doc.qt.io/qt-5/qlist.html
This commit is contained in:
Scott Kostyshak 2020-03-06 21:04:15 -05:00
parent 5e21a8fbf7
commit 690c671b1d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt/qt_helpers.cpp
View File

@ -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)