feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove usages of deprecated APIs of QLayout

Browse Source 
Replaced:
  QLayout::setMargin() -> QLayout::setContentsMargins()
  QLayout::margin() -> QLayout::getContentsMargins()

Task-number: QTBUG-76491
Change-Id: If28ef6910b3afe5d04e4746b74f9362a3e3b3c8e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Sona Kurazyan
2019-08-29 10:36:01 +02:00
parent 228f5fc319
commit 8e31932c29
117 changed files with 177 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -165,7 +165,7 @@ void AndroidManifestEditorWidget::initializePage()
m_packageNameWarningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
auto warningRow = new QHBoxLayout;
warningRow->setMargin(0);
warningRow->setContentsMargins(0, 0, 0, 0);
warningRow->addWidget(m_packageNameWarningIcon);
warningRow->addWidget(m_packageNameWarning);

2
src/plugins/android/androidpotentialkit.cpp
View File

@@ -91,7 +91,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
setWidget(mainWidget);
auto layout = new QGridLayout(mainWidget);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
auto label = new QLabel;
label->setText(tr("%1 needs additional settings to enable Android support."
" You can configure those settings in the Options dialog.")

4
src/plugins/android/androidsettingswidget.cpp
View File

@@ -103,7 +103,7 @@ public:
{
QTC_CHECK(m_detailsWidget);
auto layout = new QGridLayout(this);
layout->setMargin(12);
layout->setContentsMargins(12, 12, 12, 12);
int row = 0;
for (auto itr = validationPoints.cbegin(); itr != validationPoints.cend(); ++itr) {
RowData data;
@@ -235,7 +235,7 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
m_sdkManagerWidget = new AndroidSdkManagerWidget(m_androidConfig, m_sdkManager.get(),
m_ui->sdkManagerTab);
auto sdkMangerLayout = new QVBoxLayout(m_ui->sdkManagerTab);
sdkMangerLayout->setMargin(0);
sdkMangerLayout->setContentsMargins(0, 0, 0, 0);
sdkMangerLayout->addWidget(m_sdkManagerWidget);
connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::updatingSdk, [this]() {
m_ui->SDKLocationPathChooser->setEnabled(false);