diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index ff3319eb11d96fc69d05ac1f189e1dc4618627f9..d511f951d98a61d49e80300de4032d287055f312 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -347,9 +347,17 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration * fl->addRow(tr("Working Directory:"), boxlayout); + 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); + m_debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(this); - fl->addRow(debuggerLabel, m_debuggerLanguageChooser); + fl->addRow(debuggerLabelWidget, m_debuggerLanguageChooser); m_debuggerLanguageChooser->setCppChecked(m_cmakeRunConfiguration->useCppDebugger()); m_debuggerLanguageChooser->setQmlChecked(m_cmakeRunConfiguration->useQmlDebugger()); diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp index e69dfbe2d9e8b7d334fb25dcfa619a063ba4a9c2..f66b167309206d554a68f552d36d7e06640615c1 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp @@ -103,9 +103,17 @@ 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); + m_debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(this); - layout->addRow(debuggerLabel, m_debuggerLanguageChooser); + layout->addRow(debuggerLabelWidget, m_debuggerLanguageChooser); m_debuggerLanguageChooser->setCppChecked(m_runConfiguration->useCppDebugger()); m_debuggerLanguageChooser->setQmlChecked(m_runConfiguration->useQmlDebugger()); diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 5ea2e730d569bf6127b22f1d5193bc4e6d91ff6e..417500540c61cbf921cf39e6d3fa83604b51b346 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -177,11 +177,19 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget() form->addRow(tr("QML Viewer arguments:"), qmlViewerArgs); form->addRow(QString(), m_qmlViewerExecutable.data()); - QLabel *debuggerLabel = new QLabel(tr("Debugger:"), config); + 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); + Utils::DebuggerLanguageChooser *debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(config); form->addRow(tr("Main QML File:"), m_fileListCombo.data()); - form->addRow(debuggerLabel, debuggerLanguageChooser); + form->addRow(debuggerLabelWidget, debuggerLanguageChooser); debuggerLanguageChooser->setCppChecked(useCppDebugger()); debuggerLanguageChooser->setQmlChecked(useQmlDebugger()); diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp index 72e0ac5722f49a8fc85b841dc4b2d10df8eb2dc7..601f292efe8cdaba566b47af5da3ac78e340e943 100644 --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp @@ -224,9 +224,17 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run m_useTerminalCheck->setChecked(m_qt4RunConfiguration->runMode() == ProjectExplorer::LocalApplicationRunConfiguration::Console); toplayout->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); + m_debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(this); - toplayout->addRow(debuggerLabel, m_debuggerLanguageChooser); + toplayout->addRow(debuggerLabelWidget, m_debuggerLanguageChooser); m_debuggerLanguageChooser->setCppChecked(m_qt4RunConfiguration->useCppDebugger()); m_debuggerLanguageChooser->setQmlChecked(m_qt4RunConfiguration->useQmlDebugger());