From c8362269f43c62242e01d5c4310c21f67c6432d4 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 16 May 2022 07:01:28 +0200 Subject: [PATCH] GUI: qt6 compat: setMargins --- src/qtgui/confgui/confguiindex.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qtgui/confgui/confguiindex.cpp b/src/qtgui/confgui/confguiindex.cpp index 341cec94..35c17260 100644 --- a/src/qtgui/confgui/confguiindex.cpp +++ b/src/qtgui/confgui/confguiindex.cpp @@ -423,13 +423,12 @@ bool ConfIndexW::setupSearchPanel(int idx) return true; } -ConfSubPanelW::ConfSubPanelW(QWidget *parent, ConfNull **config, - RclConfig *rclconf) +ConfSubPanelW::ConfSubPanelW(QWidget *parent, ConfNull **config, RclConfig *rclconf) : QWidget(parent), m_config(config) { QVBoxLayout *vboxLayout = new QVBoxLayout(this); vboxLayout->setSpacing(spacing); - vboxLayout->setMargin(margin); + vboxLayout->setContentsMargins(QMargins(margin,margin,margin,margin)); m_subdirs = new ConfParamDNLW( "bogus00", this, ConfLink(new confgui::ConfLinkNullRep()), @@ -483,7 +482,7 @@ ConfSubPanelW::ConfSubPanelW(QWidget *parent, ConfNull **config, QGridLayout *gl1 = new QGridLayout(m_groupbox); gl1->setSpacing(spacing); - gl1->setMargin(margin); + gl1->setContentsMargins(QMargins(margin,margin,margin,margin)); int gridy = 0; ConfParamSLW *eskn = new ConfParamSLW(