feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMakeOpenProjectWizard: Rename misnamed variable

Browse Source 
Change-Id: Ib8836483fa1f7fdf3af4063b25a7940ae07080a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-02-13 12:16:02 +01:00
parent 60bb956861
commit ca8df404d9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -440,7 +440,7 @@ bool ChooseCMakePage::isComplete() const
CMakeRunPage::CMakeRunPage(CMakeOpenProjectWizard *cmakeWizard, Mode mode, const QString &buildDirectory) CMakeRunPage::CMakeRunPage(CMakeOpenProjectWizard *cmakeWizard, Mode mode, const QString &buildDirectory)
: QWizardPage(cmakeWizard), : QWizardPage(cmakeWizard),
m_cmakeWizard(cmakeWizard), m_cmakeWizard(cmakeWizard),
m_complete(false), m_haveCbpFile(false),
m_optionalCMake(false), m_optionalCMake(false),
m_mode(mode), m_mode(mode),
m_buildDirectory(buildDirectory) m_buildDirectory(buildDirectory)
@@ -535,7 +535,7 @@ void CMakeRunPage::initializePage()
"You can pass special arguments and rerun CMake. " "You can pass special arguments and rerun CMake. "
"Or simply finish the wizard directly.").arg(m_buildDirectory)); "Or simply finish the wizard directly.").arg(m_buildDirectory));
m_optionalCMake = true; m_optionalCMake = true;
m_complete = true; m_haveCbpFile = true;
} else { } else {
m_descriptionLabel->setText( m_descriptionLabel->setText(
tr("The directory %1 does not contain a cbp file. Qt Creator needs to create this file by running CMake. " 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() void CMakeRunPage::runCMake()
{ {
m_optionalCMake = false; m_optionalCMake = false;
m_complete = false; m_haveCbpFile = false;
Utils::Environment env = m_cmakeWizard->environment(); Utils::Environment env = m_cmakeWizard->environment();
int index = m_generatorComboBox->currentIndex(); int index = m_generatorComboBox->currentIndex();
@@ -705,10 +705,10 @@ void CMakeRunPage::cmakeFinished()
if (m_cmakeProcess->exitCode() != 0) { if (m_cmakeProcess->exitCode() != 0) {
m_exitCodeLabel->setVisible(true); m_exitCodeLabel->setVisible(true);
m_exitCodeLabel->setText(tr("CMake exited with errors. Please check CMake output.")); m_exitCodeLabel->setText(tr("CMake exited with errors. Please check CMake output."));
m_complete = false; m_haveCbpFile = false;
} else { } else {
m_exitCodeLabel->setVisible(false); m_exitCodeLabel->setVisible(false);
m_complete = true; m_haveCbpFile = true;
} }
m_cmakeProcess->deleteLater(); m_cmakeProcess->deleteLater();
m_cmakeProcess = 0; m_cmakeProcess = 0;
@@ -719,12 +719,12 @@ void CMakeRunPage::cmakeFinished()
void CMakeRunPage::cleanupPage() void CMakeRunPage::cleanupPage()
{ {
m_output->clear(); m_output->clear();
m_complete = false; m_haveCbpFile = false;
m_exitCodeLabel->setVisible(false); m_exitCodeLabel->setVisible(false);
emit completeChanged(); emit completeChanged();
} }
bool CMakeRunPage::isComplete() const bool CMakeRunPage::isComplete() const
{ {
return m_complete; return m_haveCbpFile;
} }

2
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
View File

@@ -188,7 +188,7 @@ private:
QComboBox *m_generatorComboBox; QComboBox *m_generatorComboBox;
QLabel *m_descriptionLabel; QLabel *m_descriptionLabel;
QLabel *m_exitCodeLabel; QLabel *m_exitCodeLabel;
bool m_complete; bool m_haveCbpFile;
bool m_optionalCMake; bool m_optionalCMake;
Mode m_mode; Mode m_mode;
QString m_buildDirectory; QString m_buildDirectory;