diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-11-18 14:08:08 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-11-19 11:51:31 (GMT) |
| commit | 2a85b5ac768cde4a9bbe98551528c8bae1e268a8 (patch) | |
| tree | 2bb1ba0c521f353dd5c2fb1b8fd8a7b9a5c3ba85 /Source/cmQtAutoGeneratorMocUic.cxx | |
| parent | 75819b8626abf0e64895ef19acd27dbd0fa9255b (diff) | |
| download | CMake-2a85b5ac768cde4a9bbe98551528c8bae1e268a8.zip CMake-2a85b5ac768cde4a9bbe98551528c8bae1e268a8.tar.gz CMake-2a85b5ac768cde4a9bbe98551528c8bae1e268a8.tar.bz2 | |
Autogen: Make cmQtAutoGeneratorInitializer an instantiable class
Remove the cmQtAutoGenDigest classes and make
cmQtAutoGeneratorInitializer instantiable instead.
Diffstat (limited to 'Source/cmQtAutoGeneratorMocUic.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorMocUic.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmQtAutoGeneratorMocUic.cxx b/Source/cmQtAutoGeneratorMocUic.cxx index ea99b1f..1956a89 100644 --- a/Source/cmQtAutoGeneratorMocUic.cxx +++ b/Source/cmQtAutoGeneratorMocUic.cxx @@ -142,14 +142,9 @@ bool cmQtAutoGeneratorMocUic::InitInfoFile(cmMakefile* makefile) } this->SettingsFile = InfoGetConfig("AM_SETTINGS_FILE"); - if (!this->SettingsFile.empty()) { - if (this->MultiConfig != cmQtAutoGen::SINGLE) { - this->SettingsFile = cmQtAutoGen::AppendFilenameSuffix( - this->SettingsFile, this->ConfigSuffix); - } - } else { + if (this->SettingsFile.empty()) { this->LogFileError(cmQtAutoGen::GEN, this->GetInfoFile(), - "Settings file is missing"); + "Settings file name missing"); return false; } |