diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-08-19 17:18:40 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-08-31 10:19:45 +0000 |
| commit | c9a9f08d0a850d11d0067778b65816c402184c78 (patch) | |
| tree | 0e33adecf3670ffeeff9b9d45f022565c189534d /src/plugins/cmakeprojectmanager | |
| parent | 87b15b45544b6d85486494c6a0f0e4f55e0818b4 (diff) | |
| download | qt-creator-c9a9f08d0a850d11d0067778b65816c402184c78.tar.gz | |
Cmake Open Project: Allow opening projects that have cmake errors
Change-Id: I3779fbe3f6409139b3d027f96ad390a174c0ff7f
Task-number: QTCREATORBUG-6903
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 13 | ||||
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index 0e24b2e499..cba953a473 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -60,6 +60,7 @@ #include <QSettings> #include <QStringList> #include <QApplication> +#include <QCheckBox> using namespace CMakeProjectManager; using namespace CMakeProjectManager::Internal; @@ -470,6 +471,14 @@ void CMakeRunPage::initWidgets() m_exitCodeLabel->setVisible(false); fl->addRow(m_exitCodeLabel); + m_continueCheckBox = new QCheckBox(this); + m_continueCheckBox->setVisible(false); + m_continueCheckBox->setText(tr("Open project with errors.")); + fl->addRow(m_continueCheckBox); + + connect(m_continueCheckBox, &QCheckBox::toggled, + this, &CMakeRunPage::completeChanged); + setTitle(tr("Run CMake")); setMinimumSize(600, 400); } @@ -705,8 +714,10 @@ void CMakeRunPage::cmakeFinished() m_exitCodeLabel->setText(tr("CMake exited with errors. Please check CMake output.")); static_cast<Utils::HistoryCompleter *>(m_argumentsLineEdit->completer())->removeHistoryItem(0); m_haveCbpFile = false; + m_continueCheckBox->setVisible(true); } else { m_exitCodeLabel->setVisible(false); + m_continueCheckBox->setVisible(false); m_haveCbpFile = true; } m_cmakeProcess->deleteLater(); @@ -726,5 +737,5 @@ void CMakeRunPage::cleanupPage() bool CMakeRunPage::isComplete() const { int index = m_generatorComboBox->currentIndex(); - return index != -1 && m_haveCbpFile; + return index != -1 && (m_haveCbpFile || m_continueCheckBox->isChecked()); } diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h index 9670cdc984..613e286675 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h @@ -46,6 +46,10 @@ #include <QLabel> #include <QPlainTextEdit> +QT_BEGIN_NAMESPACE +class QCheckBox; +QT_END_NAMESPACE + namespace Utils { class FancyLineEdit; class PathChooser; @@ -183,6 +187,7 @@ private: QLabel *m_generatorExtraText; QLabel *m_descriptionLabel; QLabel *m_exitCodeLabel; + QCheckBox *m_continueCheckBox; bool m_haveCbpFile; Mode m_mode; QString m_buildDirectory; |