From faab380cc114348e4ff6362b530a74258646c902 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 30 Apr 2014 12:39:56 +0200
Subject: [PATCH] CMake: Show a error if the cached generator is incompatible

Task-number: QTCREATORBUG-8594
Change-Id: I20b2ed5b82f5003315e6f72346a11980ce0929ef
Reviewed-by: Matt McLin <matt.mclin@barco.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 .../cmakeprojectmanager/cmakeopenprojectwizard.cpp   | 12 ++++++++++++
 .../cmakeprojectmanager/cmakeopenprojectwizard.h     |  1 +
 2 files changed, 13 insertions(+)

diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index e39fa1cf87e..4a4e2ff6426 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 ccd7d14d5f9..a3ab8b01932 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;