summaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-02-10 12:28:58 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-02-11 18:59:40 +0000
commit2055c451f8ff2b2f5e7de105454790d7b240a6b3 (patch)
treefadcf53b118e7584e4f4828f2aa57a9bc26b53ed /src/shared
parentcc8b01240f54048ca16ace963bf205e813728bfb (diff)
QtTools: replace deprecated QLayout::margin() with contentsMargins()
QLayout::margin()/setMargin() is deprecated - replace it with it's successors contentsMargins()/setContentsMargins() Change-Id: I8b6a36f3e0d0e00186a7d9cdf4827cf06f302235 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/findwidget/abstractfindwidget.cpp2
-rw-r--r--src/shared/qtpropertybrowser/qteditorfactory.cpp2
-rw-r--r--src/shared/qtpropertybrowser/qttreepropertybrowser.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp
index f554e935f..79cd1ccd0 100644
--- a/src/shared/findwidget/abstractfindwidget.cpp
+++ b/src/shared/findwidget/abstractfindwidget.cpp
@@ -109,7 +109,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
}
#ifndef Q_OS_MAC
topLayOut->setSpacing(6);
- topLayOut->setMargin(0);
+ topLayOut->setContentsMargins(QMargins());
#endif
m_toolClose = new QToolButton(this);
diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp
index de852a740..664667c65 100644
--- a/src/shared/qtpropertybrowser/qteditorfactory.cpp
+++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp
@@ -1530,7 +1530,7 @@ QtCharEdit::QtCharEdit(QWidget *parent)
{
QHBoxLayout *layout = new QHBoxLayout(this);
layout->addWidget(m_lineEdit);
- layout->setMargin(0);
+ layout->setContentsMargins(QMargins());
m_lineEdit->installEventFilter(this);
m_lineEdit->setReadOnly(true);
m_lineEdit->setFocusProxy(this);
diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
index 14d1301a7..d8f38cd12 100644
--- a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
+++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp
@@ -428,7 +428,7 @@ static QIcon drawIndicatorIcon(const QPalette &palette, QStyle *style)
void QtTreePropertyBrowserPrivate::init(QWidget *parent)
{
QHBoxLayout *layout = new QHBoxLayout(parent);
- layout->setMargin(0);
+ layout->setContentsMargins(QMargins());
m_treeWidget = new QtPropertyEditorView(parent);
m_treeWidget->setEditorPrivate(this);
m_treeWidget->setIconSize(QSize(18, 18));