commit a710b63acebaad64e749d4ef5b4bb32f44597ef3
Author: Juergen Spitzmueller <[email protected]>
Date: Tue Jul 21 09:15:11 2026 +0200
Fix compilation with Qt < 5.12
Only as of Qt 5.12 the operator| is declarted in the Qt namespace for
QFlags, see
https://code.qt.io/cgit/qt/qtbase.git/commit/src/corelib/global/qnamespace.h?id=e759d38d491d9044a0558b1d45911e3b4115e772
---
src/frontends/qt/GuiDocument.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index eb677a1d2f..aac142cbb2 100644
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -3006,7 +3006,7 @@ void GuiDocument::addSpecialFont()
item->setData(1, Qt::UserRole, "rm");
item->setText(2, rmfont);
// no scale here
- item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ item->setFlags(Qt::ItemFlags(Qt::ItemIsSelectable |
Qt::ItemIsEnabled));
if (rmosf)
item->setCheckState(4, Qt::Checked);
else
@@ -3052,7 +3052,7 @@ void GuiDocument::addSpecialFont()
QString sfscl;
sfscl.setNum(sfscale);
item->setText(3, sfscl);
- item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ item->setFlags(Qt::ItemFlags(Qt::ItemIsSelectable |
Qt::ItemIsEnabled));
if (sfosf)
item->setCheckState(4, Qt::Checked);
else
@@ -3099,7 +3099,7 @@ void GuiDocument::addSpecialFont()
QString ttscl;
ttscl.setNum(ttscale);
item->setText(3, ttscl);
- item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ item->setFlags(Qt::ItemFlags(Qt::ItemIsSelectable |
Qt::ItemIsEnabled));
if (ttosf)
item->setCheckState(4, Qt::Checked);
else
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
