UI: Replace deprecated QLayout->setMargin with setContentsMargin

QLayout->setMargin has been deprecated since Qt 5.13 (though marked obsolete since at least Qt 4.8) and removed in Qt6. It was replaced by QLayout->setContentsMargins, which is available in all versions of Qt5. Building against Qt 5.13+ can produce compiler warnings when using QLayout->setMargin, and warnings are bad. https://doc.qt.io/archives/qt-4.8/qlayout-obsolete.html https://doc.qt.io/qt-5/qlayout-obsolete.html qt/qtbase@d6d33f0 https://github.com/qt/qtbase/blame/5.15.2/src/widgets/kernel/qlayout.h
obsproject · Jan 19, 2021 · 54207a0 · 54207a0
1 parent 900b534
commit 54207a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/UI/hotkey-edit.hpp b/UI/hotkey-edit.hpp
@@ -102,7 +102,7 @@ class OBSHotkeyWidget : public QWidget {
 	{
 		auto layout = new QVBoxLayout;
 		layout->setSpacing(0);
-		layout->setMargin(0);
+		layout->setContentsMargins(0, 0, 0, 0);
 		setLayout(layout);
 
 		SetKeyCombinations(combos);

diff --git a/UI/window-importer.cpp b/UI/window-importer.cpp
@@ -81,7 +81,7 @@ QWidget *ImporterEntryPathItemDelegate::createEditor(
 	};
 
 	QHBoxLayout *layout = new QHBoxLayout();
-	layout->setMargin(0);
+	layout->setContentsMargins(0, 0, 0, 0);
 	layout->setSpacing(0);
 
 	QLineEdit *text = new QLineEdit();

diff --git a/UI/window-remux.cpp b/UI/window-remux.cpp
@@ -100,7 +100,7 @@ QWidget *RemuxEntryPathItemDelegate::createEditor(
 		};
 
 		QHBoxLayout *layout = new QHBoxLayout();
-		layout->setMargin(0);
+		layout->setContentsMargins(0, 0, 0, 0);
 		layout->setSpacing(0);
 
 		QLineEdit *text = new QLineEdit();