commit de637cdbcbeba44d5fc58e3ba9b75c2eb8919bfc
Author: Juergen Spitzmueller <[email protected]>
Date: Tue Nov 2 16:28:40 2021 +0100
Amend 59b8c209c41d
QFontMetrics::width() is no longer valid in Qt6
---
src/frontends/qt/GuiView.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 65d51cf..1101b89 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -648,7 +648,11 @@ GuiView::GuiView(int id)
zoom_slider_->setToolTip(qt_("Workarea zoom level. Drag, use Ctrl-+/-
or Shift-Mousewheel to adjust."));
// Buttons to change zoom stepwise
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
+ QSize s(fm.horizontalAdvance('+'), fm.height());
+#else
QSize s(fm.width('+'), fm.height());
+#endif
zoom_in_ = new GuiClickableLabel(statusBar());
zoom_in_->setText("+");
zoom_in_->setFixedSize(s);
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
