Header not needed anymore.

Revert "Remove workaround that is not needed anymore with Qt 5.12"
We want to support Qt 5.9 for now. This reverts commit 8837f8ca8c.
2024-11-27 03:36:39 +00:00 · 2024-10-30 20:29:54 +01:00 · 2024-10-30 19:31:59 +01:00
2 changed files with 6 additions and 3 deletions
--- a/src/frontends/qt/GuiLyXFiles.cpp
+++ b/src/frontends/qt/GuiLyXFiles.cpp
@ -613,7 +613,12 @@ void GuiLyXFiles::passParams(string const & data)

 void GuiLyXFiles::selectItem(QString const & item)
 {
-	QList<QTreeWidgetItem *> twi = filesLW->findItems(item, Qt::MatchExactly | Qt::MatchRecursive);
+	/* Using an intermediary variable flags is needed up to at least
+	 * Qt 5.5 because of a subtle namespace issue. See:
+	 *   https://stackoverflow.com/questions/10755058/qflags-enum-type-conversion-fails-all-of-a-sudden
+	 * for details.*/
+	Qt::MatchFlags const flags(Qt::MatchExactly|Qt::MatchRecursive);
+	QList<QTreeWidgetItem *> twi = filesLW->findItems(item, flags);
 	if (!twi.isEmpty())
 		twi.first()->setSelected(true);
 }
--- a/src/insets/InsetListingsParams.h
+++ b/src/insets/InsetListingsParams.h
@ -14,8 +14,6 @@

 #include "InsetCaptionable.h"

-#include <map>
-
 namespace lyx {

 class InsetListingsParams {
Author	SHA1	Message	Date
Pavel Sanda	a8afca4de0	Header not needed anymore.	2024-10-30 20:29:54 +01:00
Jean-Marc Lasgouttes	e30758166e	Revert "Remove workaround that is not needed anymore with Qt 5.12" We want to support Qt 5.9 for now. This reverts commit `8837f8ca8c`.	2024-10-30 19:31:59 +01:00