diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 12 | ||||
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index e39fa1cf87..4a4e2ff642 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -429,6 +429,9 @@ void CMakeRunPage::initWidgets() m_generatorComboBox = new QComboBox(this); fl->addRow(tr("Generator:"), m_generatorComboBox); + m_generatorExtraText = new QLabel(this); + fl->addRow(m_generatorExtraText); + m_runCMake = new QPushButton(this); m_runCMake->setText(tr("Run CMake")); connect(m_runCMake, SIGNAL(clicked()), this, SLOT(runCMake())); @@ -550,6 +553,15 @@ void CMakeRunPage::initializePage() m_generatorComboBox->addItem(info.displayName(), qVariantFromValue(info)); } + + if (!m_generatorComboBox->count()) { + m_generatorExtraText->setVisible(true); + m_generatorExtraText->setText(tr("The cached generator %1 is incompatible with the configured kits.") + .arg(QString::fromLatin1(cachedGenerator))); + } else { + m_generatorExtraText->setVisible(false); + } + m_generatorComboBox->setCurrentIndex(defaultIndex); } else { // Note: We don't compare the actually cached generator to what is set in the buildconfiguration diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h index ccd7d14d5f..a3ab8b0193 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h @@ -180,6 +180,7 @@ private: Utils::QtcProcess *m_cmakeProcess; Utils::FancyLineEdit *m_argumentsLineEdit; QComboBox *m_generatorComboBox; + QLabel *m_generatorExtraText; QLabel *m_descriptionLabel; QLabel *m_exitCodeLabel; bool m_haveCbpFile; |