summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <laurent.montel@kdab.com>2019-10-01 10:32:53 +0200
committerLaurent Montel <laurent.montel@kdab.com>2019-10-17 21:11:22 +0000
commitb9b2d5ef5d3366b67aef797a4c07d508ddb034b0 (patch)
treeb24de5cef4890fb2e30a6b43fe019491ec9e4e67
parentfa8ff4108f646e6f3d9a3b8d4b59abd1a299ae10 (diff)
downloadqt-creator-b9b2d5ef5d3366b67aef797a4c07d508ddb034b0.tar.gz
Remove extra setMargin(..) Some lines after we can see a
setContentsMargins Change-Id: I376129566c7df466a3413f001b42c670ee7c7022 Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/libs/qmleditorwidgets/contextpanewidget.cpp1
-rw-r--r--src/libs/qmleditorwidgets/contextpanewidgetimage.cpp1
-rw-r--r--src/libs/utils/fancymainwindow.cpp1
-rw-r--r--src/plugins/bineditor/bineditorplugin.cpp1
-rw-r--r--src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp1
5 files changed, 0 insertions, 5 deletions
diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index d09902be1b..d628ae5eed 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -158,7 +158,6 @@ void DragWidget::enterEvent(QEvent *)
ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_currentWidget(0)
{
QGridLayout *layout = new QGridLayout(this);
- layout->setMargin(0);
layout->setContentsMargins(1, 1, 1, 1);
layout->setSpacing(0);
m_toolButton = new QToolButton(this);
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
index dcc3e9ecc6..abe974ee5c 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
@@ -884,7 +884,6 @@ PreviewDialog::PreviewDialog(QWidget *parent) : DragWidget(parent)
QVBoxLayout *layout = new QVBoxLayout(this);
QHBoxLayout *horizontalLayout = new QHBoxLayout();
QHBoxLayout *horizontalLayout2 = new QHBoxLayout();
- layout->setMargin(0);
layout->setContentsMargins(2, 2, 2, 16);
layout->setSpacing(4);
QToolButton *toolButton = new QToolButton(this);
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 9a5c84894c..5398218789 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -182,7 +182,6 @@ public:
m_maximumActiveSize = QSize(maxWidth, activeHeight);
auto layout = new QHBoxLayout(this);
- layout->setMargin(0);
layout->setSpacing(0);
layout->setContentsMargins(4, 0, 0, 0);
layout->addWidget(m_titleLabel);
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 9fbba5c7f8..b6bc79d23a 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -368,7 +368,6 @@ public:
auto l = new QHBoxLayout;
auto w = new QWidget;
- l->setMargin(0);
l->setContentsMargins(0, 0, 5, 0);
l->addStretch(1);
l->addWidget(m_addressEdit);
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 8fd2508315..627299c64e 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -637,7 +637,6 @@ ClangEditorDocumentProcessor::creatorForHeaderErrorDiagnosticWidget(
return [firstHeaderErrorDiagnostic]() {
auto vbox = new QVBoxLayout;
- vbox->setMargin(0);
vbox->setContentsMargins(10, 0, 0, 2);
vbox->setSpacing(2);