Unbreak with Qt6 6.10.1

This commit is contained in:
rsadowski
2025-12-10 16:52:43 +00:00
parent 6e0ee09e19
commit f49d6ba652
2 changed files with 33 additions and 0 deletions
@@ -0,0 +1,12 @@
Index: src/frontends/qt/GuiSymbols.cpp
--- src/frontends/qt/GuiSymbols.cpp.orig
+++ src/frontends/qt/GuiSymbols.cpp
@@ -250,7 +250,7 @@ class GuiSymbols::Model : public QAbstractListModel (p
"style=\"font-size: xx-large;\">%1"
"</span><br>U+%2</p>%3")
.arg(toqstr(c))
- .arg(QString("%1").arg(c, 0, 16).toUpper())
+ .arg(QString::number(c, 16).toUpper())
.arg(latex));
}
case Qt::SizeHintRole:
@@ -0,0 +1,21 @@
Index: src/frontends/qt/Menus.cpp
--- src/frontends/qt/Menus.cpp.orig
+++ src/frontends/qt/Menus.cpp
@@ -277,7 +277,7 @@ class MenuItem { (public)
/// set the description of the submenu
void submenuname(QString const & name) { submenuname_ = name; }
///
- bool hasSubmenu() const { return !submenu_.isEmpty(); }
+ bool hasSubmenu() const;
///
MenuDefinition const & submenu() const { return submenu_.at(0); }
MenuDefinition & submenu() { return submenu_[0]; }
@@ -382,6 +382,8 @@ class MenuDefinition { (public)
///
QString name_;
};
+
+bool MenuItem::hasSubmenu() const { return !submenu_.isEmpty(); }
/// Helper for std::find_if