BUG: Don't enable generate if configure completed with errors.
ENH: Allow build w/ Qt configured with no STL support.
This commit is contained in:
parent
af46642deb
commit
3cd1d6e9e1
|
@ -284,7 +284,7 @@ void CMakeSetupDialog::finishConfigure(int err)
|
|||
tr("Error in configuration process, project files may be invalid"),
|
||||
QMessageBox::Ok);
|
||||
}
|
||||
if(!this->CacheValues->cacheModel()->modifiedValues())
|
||||
else if(!this->CacheValues->cacheModel()->modifiedValues())
|
||||
{
|
||||
this->setGenerateEnabled(true);
|
||||
}
|
||||
|
|
|
@ -54,7 +54,7 @@ QCMake::QCMake(QObject* p)
|
|||
std::vector<std::string>::iterator iter;
|
||||
for(iter = generators.begin(); iter != generators.end(); ++iter)
|
||||
{
|
||||
this->AvailableGenerators.append(QString::fromStdString(*iter));
|
||||
this->AvailableGenerators.append(iter->c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -107,7 +107,7 @@ void QCMake::setBinaryDirectory(const QString& dir)
|
|||
const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR");
|
||||
std::string curGen = cmExternalMakefileProjectGenerator::
|
||||
CreateFullGeneratorName(itm.GetValue(), extraGen);
|
||||
this->setGenerator(QString::fromStdString(curGen));
|
||||
this->setGenerator(curGen.c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue