diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-29 10:36:01 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-09-02 13:01:07 +0000 |
commit | 8e31932c295b158805410a9991bef8edc869d21b (patch) | |
tree | f12f6fcdccecf70760b0ae9c1fedaefef5e5a807 /src/plugins/git | |
parent | 228f5fc319e33ed32cb1f997c65b68b5ddc18fd7 (diff) | |
download | qt-creator-8e31932c295b158805410a9991bef8edc869d21b.tar.gz |
Remove usages of deprecated APIs of QLayout
Replaced:
QLayout::setMargin() -> QLayout::setContentsMargins()
QLayout::margin() -> QLayout::getContentsMargins()
Task-number: QTBUG-76491
Change-Id: If28ef6910b3afe5d04e4746b74f9362a3e3b3c8e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/git')
-rw-r--r-- | src/plugins/git/gerrit/gerritremotechooser.cpp | 2 | ||||
-rw-r--r-- | src/plugins/git/gitgrep.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gerrit/gerritremotechooser.cpp b/src/plugins/git/gerrit/gerritremotechooser.cpp index 9d0c465ded..8e5e7cd882 100644 --- a/src/plugins/git/gerrit/gerritremotechooser.cpp +++ b/src/plugins/git/gerrit/gerritremotechooser.cpp @@ -51,7 +51,7 @@ GerritRemoteChooser::GerritRemoteChooser(QWidget *parent) : m_remoteComboBox->setMinimumSize(QSize(40, 0)); horizontalLayout->addWidget(m_remoteComboBox); - horizontalLayout->setMargin(0); + horizontalLayout->setContentsMargins(0, 0, 0, 0); m_resetRemoteButton = new QToolButton(this); m_resetRemoteButton->setToolTip(tr("Refresh Remote Servers")); diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp index f276a5e725..056903f855 100644 --- a/src/plugins/git/gitgrep.cpp +++ b/src/plugins/git/gitgrep.cpp @@ -240,7 +240,7 @@ GitGrep::GitGrep(QObject *parent) { m_widget = new QWidget; auto layout = new QHBoxLayout(m_widget); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); m_treeLineEdit = new FancyLineEdit; m_treeLineEdit->setPlaceholderText(tr("Tree (optional)")); m_treeLineEdit->setToolTip(tr("Can be HEAD, tag, local or remote branch, or a commit hash.\n" |