diff options
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 12 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 2fd28c3..95873a2 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -413,7 +413,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile( return true; } -std::string cmQtAutoGenerators::MocSettingsStringCompose() +std::string cmQtAutoGenerators::SettingsStringGenMoc() { std::string res; res += this->MocCompileDefinitionsStr; @@ -427,7 +427,7 @@ std::string cmQtAutoGenerators::MocSettingsStringCompose() return res; } -std::string cmQtAutoGenerators::UicSettingsStringCompose() +std::string cmQtAutoGenerators::SettingsStringGenUic() { std::string res; res += cmJoin(this->UicTargetOptions, "@osep@"); @@ -437,7 +437,7 @@ std::string cmQtAutoGenerators::UicSettingsStringCompose() return res; } -std::string cmQtAutoGenerators::RccSettingsStringCompose() +std::string cmQtAutoGenerators::SettingsStringGenRcc() { std::string res; res += JoinOptions(this->RccOptions); @@ -449,9 +449,9 @@ void cmQtAutoGenerators::SettingsFileRead(cmMakefile* makefile, const std::string& targetDirectory) { // Compose current settings strings - this->MocSettingsString = this->MocSettingsStringCompose(); - this->UicSettingsString = this->UicSettingsStringCompose(); - this->RccSettingsString = this->RccSettingsStringCompose(); + this->MocSettingsString = this->SettingsStringGenMoc(); + this->UicSettingsString = this->SettingsStringGenUic(); + this->RccSettingsString = this->SettingsStringGenRcc(); // Read old settings const std::string filename = OldSettingsFile(targetDirectory); diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 953349b..36519c5 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -27,9 +27,10 @@ private: const std::string& targetDirectory, const std::string& config); - std::string MocSettingsStringCompose(); - std::string UicSettingsStringCompose(); - std::string RccSettingsStringCompose(); + // - Settings file + std::string SettingsStringGenMoc(); + std::string SettingsStringGenUic(); + std::string SettingsStringGenRcc(); void SettingsFileRead(cmMakefile* makefile, const std::string& targetDirectory); bool SettingsFileWrite(const std::string& targetDirectory); |