diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp index 3fd4c8999ac7e0b8e68b5dcebc7d5b3c667410e6..28665c27525cf427c2e0b7e7507d7059f3f48cca 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp @@ -125,6 +125,7 @@ BuildSettingsSubWidgets::BuildSettingsSubWidgets(QWidget *parent) : QWidget(parent) { new QVBoxLayout(this); + layout()->setMargin(0); } /// diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index d71ad55cea0f81012df0ce62aebd1a0a56171f4a..585b8620631e08c340ca6b50c01e3ccbbeef6392 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -158,6 +158,7 @@ ActiveConfigurationWidget::ActiveConfigurationWidget(QWidget *parent) : QWidget(parent) { QGridLayout *grid = new QGridLayout(this); + grid->setMargin(0); RunConfigurationComboBox *runConfigurationComboBox = new RunConfigurationComboBox(this); grid->addWidget(new QLabel(tr("Active run configuration")), 0, 0); grid->addWidget(runConfigurationComboBox, 0, 1); @@ -603,6 +604,7 @@ ProjectWindow::ProjectWindow(QWidget *parent) m_spacerBetween = new QWidget(this); QVBoxLayout *vbox = new QVBoxLayout(m_spacerBetween); + vbox->setMargin(0); m_spacerBetween->setLayout(vbox); vbox->addSpacerItem(new QSpacerItem(10, 15, QSizePolicy::Fixed, QSizePolicy::Fixed)); vbox->addWidget(new OnePixelBlackLine(m_spacerBetween)); diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.ui b/src/plugins/projectexplorer/runsettingspropertiespage.ui index e95e8e4b76567fbc0e63a1caba81a8d784500d2e..8c4aec3e786ede68170d0a7dae8c941404833683 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.ui +++ b/src/plugins/projectexplorer/runsettingspropertiespage.ui @@ -6,11 +6,14 @@ <rect> <x>0</x> <y>0</y> - <width>416</width> - <height>35</height> + <width>437</width> + <height>25</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="margin"> + <number>0</number> + </property> <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> diff --git a/src/plugins/qt4projectmanager/makestep.ui b/src/plugins/qt4projectmanager/makestep.ui index f2007e7e398422484f1f02abf1c6f2198900e548..1dfff96f279ba078dea19c0ddcda45b41c135bf1 100644 --- a/src/plugins/qt4projectmanager/makestep.ui +++ b/src/plugins/qt4projectmanager/makestep.ui @@ -6,11 +6,14 @@ <rect> <x>0</x> <y>0</y> - <width>235</width> - <height>64</height> + <width>220</width> + <height>46</height> </rect> </property> <layout class="QFormLayout" name="formLayout"> + <property name="margin"> + <number>0</number> + </property> <item row="0" column="0"> <widget class="QLabel" name="makeLabel"> <property name="text"> diff --git a/src/plugins/qt4projectmanager/qmakestep.ui b/src/plugins/qt4projectmanager/qmakestep.ui index f8d5b9b62b6a7452a6f193858c1556506e5973b9..f59dedaf52637e1221e1f9184bca9351e500f358 100644 --- a/src/plugins/qt4projectmanager/qmakestep.ui +++ b/src/plugins/qt4projectmanager/qmakestep.ui @@ -6,11 +6,14 @@ <rect> <x>0</x> <y>0</y> - <width>448</width> - <height>210</height> + <width>390</width> + <height>172</height> </rect> </property> <layout class="QFormLayout" name="formLayout"> + <property name="margin"> + <number>0</number> + </property> <item row="0" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui index 4ccc7d45334a5794f915e983bbf57e6904e5eb0c..785e8d632721332bb577f2d8eb155ece2ea2239e 100644 --- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui +++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui @@ -52,6 +52,9 @@ placeholder</string> <item> <widget class="QWidget" name="detailsWidget" native="true"> <layout class="QGridLayout" name="gridLayout"> + <property name="margin"> + <number>0</number> + </property> <item row="0" column="0"> <widget class="QLabel" name="nameLabel"> <property name="text"> diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp index 3b12a26b18fded821448799883248e37a60e6068..76e25d0a79445019ab8b27ddee19c7f0218d62ef 100644 --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp @@ -141,6 +141,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run resetButton->setIcon(QIcon(":/core/images/reset.png")); QHBoxLayout *boxlayout = new QHBoxLayout(); + boxlayout->setMargin(0); boxlayout->addWidget(m_workingDirectoryEdit); boxlayout->addWidget(resetButton); toplayout->addRow(tr("Working Directory:"), boxlayout); @@ -165,7 +166,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run m_detailsWidget = new QWidget(this); m_detailsWidget->setVisible(false); QVBoxLayout *vboxTopLayout = new QVBoxLayout(this); - vboxTopLayout->setContentsMargins(0, -1, 0, -1); + vboxTopLayout->setMargin(0); m_summaryLabel = new QLabel(this); m_summaryLabel->setText("This is a summary"); QAbstractButton *detailsButton = new Utils::DetailsButton(this); @@ -174,6 +175,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run this, SLOT(toggleDetails())); QHBoxLayout *detailsLayout = new QHBoxLayout(); + detailsLayout->setMargin(0); detailsLayout->addWidget(m_summaryLabel); detailsLayout->addWidget(detailsButton);