diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index c0a65fef82cb5c1fe8af76bae70104b526144573..b8b7a9bcb64e6c8652cd9f4a799f590e12bcf4a2 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -356,18 +356,11 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration * QCheckBox *runInTerminal = new QCheckBox; fl->addRow(tr("Run in Terminal"), runInTerminal); - - QWidget *debuggerLabelWidget = new QWidget(this); - QVBoxLayout *debuggerLabelLayout = new QVBoxLayout(debuggerLabelWidget); - debuggerLabelLayout->setMargin(0); - debuggerLabelLayout->setSpacing(0); - debuggerLabelWidget->setLayout(debuggerLabelLayout); QLabel *debuggerLabel = new QLabel(tr("Debugger:"), this); - debuggerLabelLayout->addWidget(debuggerLabel); - debuggerLabelLayout->addStretch(10); + debuggerLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding); m_debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(this); - fl->addRow(debuggerLabelWidget, m_debuggerLanguageChooser); + fl->addRow(debuggerLabel, m_debuggerLanguageChooser); m_debuggerLanguageChooser->setCppChecked(m_cmakeRunConfiguration->useCppDebugger()); m_debuggerLanguageChooser->setQmlChecked(m_cmakeRunConfiguration->useQmlDebugger()); diff --git a/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp b/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp index 3cb3f1a1201f1218e5c1110fe2e8e5fd3fcbde47..00de6332852e2cb23bdf7b3dd23700768d6486d1 100644 --- a/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp +++ b/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp @@ -78,17 +78,11 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE m_useTerminalCheck = new QCheckBox(tr("Run in &Terminal"), this); layout->addRow(QString(), m_useTerminalCheck); - QWidget *debuggerLabelWidget = new QWidget(this); - QVBoxLayout *debuggerLabelLayout = new QVBoxLayout(debuggerLabelWidget); - debuggerLabelLayout->setMargin(0); - debuggerLabelLayout->setSpacing(0); - debuggerLabelWidget->setLayout(debuggerLabelLayout); QLabel *debuggerLabel = new QLabel(tr("Debugger:"), this); - debuggerLabelLayout->addWidget(debuggerLabel); - debuggerLabelLayout->addStretch(10); + debuggerLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding); m_debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(this); - layout->addRow(debuggerLabelWidget, m_debuggerLanguageChooser); + layout->addRow(debuggerLabel, m_debuggerLanguageChooser); m_debuggerLanguageChooser->setCppChecked(m_runConfiguration->useCppDebugger()); m_debuggerLanguageChooser->setQmlChecked(m_runConfiguration->useQmlDebugger()); diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp index 4a7097c90606b6b65b9783107290201f16cefc78..10c897ca22ccee72c0b5a590d60288d16538311a 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp @@ -117,17 +117,11 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun // Debugging // - QWidget *debuggerLabelWidget = new QWidget; - QVBoxLayout *debuggerLabelLayout = new QVBoxLayout(debuggerLabelWidget); - debuggerLabelLayout->setMargin(0); - debuggerLabelLayout->setSpacing(0); - debuggerLabelWidget->setLayout(debuggerLabelLayout); QLabel *debuggerLabel = new QLabel(tr("Debugger:")); - debuggerLabelLayout->addWidget(debuggerLabel); - debuggerLabelLayout->addStretch(10); + debuggerLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding); DebuggerLanguageChooser *debuggerLanguageChooser = new DebuggerLanguageChooser(formWidget); - form->addRow(debuggerLabelWidget, debuggerLanguageChooser); + form->addRow(debuggerLabel, debuggerLanguageChooser); debuggerLanguageChooser->setCppChecked(rc->useCppDebugger()); debuggerLanguageChooser->setQmlChecked(rc->useQmlDebugger()); diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp index 75eb37d6f6fd94cb754d6422f26a35f8f30921e2..1ca31df3f03a18ce95d262865f97cff606838c17 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp @@ -235,17 +235,11 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run toplayout->addRow(QString(), m_useTerminalCheck); m_useTerminalCheck->setVisible(qt4RunConfiguration->target()->id() != Constants::QT_SIMULATOR_TARGET_ID); - QWidget *debuggerLabelWidget = new QWidget(this); - QVBoxLayout *debuggerLabelLayout = new QVBoxLayout(debuggerLabelWidget); - debuggerLabelLayout->setMargin(0); - debuggerLabelLayout->setSpacing(0); - debuggerLabelWidget->setLayout(debuggerLabelLayout); QLabel *debuggerLabel = new QLabel(tr("Debugger:"), this); - debuggerLabelLayout->addWidget(debuggerLabel); - debuggerLabelLayout->addStretch(10); + debuggerLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding); m_debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(this); - toplayout->addRow(debuggerLabelWidget, m_debuggerLanguageChooser); + toplayout->addRow(debuggerLabel, m_debuggerLanguageChooser); m_debuggerLanguageChooser->setCppChecked(m_qt4RunConfiguration->useCppDebugger()); m_debuggerLanguageChooser->setQmlChecked(m_qt4RunConfiguration->useQmlDebugger()); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp index 78a7e4a77c355e787d2e5ee8b299790971603513..8ea728956d6b256f8e3abe91a3221aa07986a20d 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp @@ -36,6 +36,7 @@ #include <utils/debuggerlanguagechooser.h> #include <utils/detailswidget.h> +#include <QtGui/QLabel> #include <QtGui/QLineEdit> #include <QtGui/QVBoxLayout> #include <QtGui/QHBoxLayout> @@ -69,8 +70,11 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget( detailsBoxLayout->addLayout(formLayout); formLayout->addRow(tr("Arguments:"), m_argumentsLineEdit); + QLabel *debuggerLabel = new QLabel(tr("Debugger:"), this); + debuggerLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding); + m_debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(this); - formLayout->addRow(tr("Debugger:"), m_debuggerLanguageChooser); + formLayout->addRow(debuggerLabel, m_debuggerLanguageChooser); m_debuggerLanguageChooser->setCppChecked(m_runConfiguration->useCppDebugger()); m_debuggerLanguageChooser->setQmlChecked(m_runConfiguration->useQmlDebugger());