diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-01-11 22:04:45 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-01-12 23:00:44 (GMT) |
commit | d7d2cb48c69e2a9da72a8baf188f02b81ec9c34f (patch) | |
tree | 81c464e1b1bef9b17065ba6ece8cf9185bbf0cd9 /Source/cmQtAutoGenerators.h | |
parent | 721997a7a23f0cfa5c9e096cc3768625a51f359d (diff) | |
download | CMake-d7d2cb48c69e2a9da72a8baf188f02b81ec9c34f.zip CMake-d7d2cb48c69e2a9da72a8baf188f02b81ec9c34f.tar.gz CMake-d7d2cb48c69e2a9da72a8baf188f02b81ec9c34f.tar.bz2 |
Autogen: Generators: Save the UIC/RCC settings that were actually used
Diffstat (limited to 'Source/cmQtAutoGenerators.h')
-rw-r--r-- | Source/cmQtAutoGenerators.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 3427be6..3720a00 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -27,10 +27,12 @@ private: const std::string& targetDirectory, const std::string& config); - std::string MocCurrentSettingsString(); - void ReadOldMocSettingsFile(cmMakefile* makefile, - const std::string& targetDirectory); - bool WriteOldMocSettingsFile(const std::string& targetDirectory); + std::string MocSettingsStringCompose(); + std::string UicSettingsStringCompose(); + std::string RccSettingsStringCompose(); + void OldSettingsReadFile(cmMakefile* makefile, + const std::string& targetDirectory); + bool OldSettingsWriteFile(const std::string& targetDirectory); // - Init and run void Init(); @@ -138,10 +140,12 @@ private: std::vector<std::string> SkipUic; std::vector<std::string> UicTargetOptions; std::map<std::string, std::string> UicOptions; + std::string UicSettingsString; // - Rcc std::vector<std::string> RccSources; std::map<std::string, std::string> RccOptions; std::map<std::string, std::vector<std::string> > RccInputs; + std::string RccSettingsString; // - Utility cmFilePathChecksum fpathCheckSum; cmsys::RegularExpression RegExpQObject; |