From ca8df404d9de10ad9284c054b51e5ccc04e76928 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 13 Feb 2013 12:16:02 +0100
Subject: [PATCH] CMakeOpenProjectWizard: Rename misnamed variable
Change-Id: Ib8836483fa1f7fdf3af4063b25a7940ae07080a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
.../cmakeprojectmanager/cmakeopenprojectwizard.cpp | 14 +++++++-------
.../cmakeprojectmanager/cmakeopenprojectwizard.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index 5ee87a1be16..ad1234244fd 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -440,7 +440,7 @@ bool ChooseCMakePage::isComplete() const
CMakeRunPage::CMakeRunPage(CMakeOpenProjectWizard *cmakeWizard, Mode mode, const QString &buildDirectory)
: QWizardPage(cmakeWizard),
m_cmakeWizard(cmakeWizard),
- m_complete(false),
+ m_haveCbpFile(false),
m_optionalCMake(false),
m_mode(mode),
m_buildDirectory(buildDirectory)
@@ -535,7 +535,7 @@ void CMakeRunPage::initializePage()
"You can pass special arguments and rerun CMake. "
"Or simply finish the wizard directly.").arg(m_buildDirectory));
m_optionalCMake = true;
- m_complete = true;
+ m_haveCbpFile = true;
} else {
m_descriptionLabel->setText(
tr("The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running CMake. "
@@ -623,7 +623,7 @@ bool CMakeRunPage::validatePage()
void CMakeRunPage::runCMake()
{
m_optionalCMake = false;
- m_complete = false;
+ m_haveCbpFile = false;
Utils::Environment env = m_cmakeWizard->environment();
int index = m_generatorComboBox->currentIndex();
@@ -705,10 +705,10 @@ void CMakeRunPage::cmakeFinished()
if (m_cmakeProcess->exitCode() != 0) {
m_exitCodeLabel->setVisible(true);
m_exitCodeLabel->setText(tr("CMake exited with errors. Please check CMake output."));
- m_complete = false;
+ m_haveCbpFile = false;
} else {
m_exitCodeLabel->setVisible(false);
- m_complete = true;
+ m_haveCbpFile = true;
}
m_cmakeProcess->deleteLater();
m_cmakeProcess = 0;
@@ -719,12 +719,12 @@ void CMakeRunPage::cmakeFinished()
void CMakeRunPage::cleanupPage()
{
m_output->clear();
- m_complete = false;
+ m_haveCbpFile = false;
m_exitCodeLabel->setVisible(false);
emit completeChanged();
}
bool CMakeRunPage::isComplete() const
{
- return m_complete;
+ return m_haveCbpFile;
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
index 220966abfd8..6786ab36778 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
@@ -188,7 +188,7 @@ private:
QComboBox *m_generatorComboBox;
QLabel *m_descriptionLabel;
QLabel *m_exitCodeLabel;
- bool m_complete;
+ bool m_haveCbpFile;
bool m_optionalCMake;
Mode m_mode;
QString m_buildDirectory;
--
GitLab