Merge branch 'autorcc-only-no-rebuild' into release

This commit is contained in:
Brad King 2016-11-09 11:26:04 -05:00
commit dc083f9534
1 changed files with 2 additions and 2 deletions

View File

@ -455,8 +455,8 @@ static std::string ReadAll(const std::string& filename)
bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile) bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
{ {
if (!cmsys::SystemTools::FileExists(this->OutMocCppFilenameAbs.c_str()) || // If settings changed everything needs to be re-generated.
(this->OldCompileSettingsStr != this->CurrentCompileSettingsStr)) { if (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr) {
this->GenerateAll = true; this->GenerateAll = true;
} }