diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-11-17 11:53:20 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-11-19 11:51:30 (GMT) |
| commit | 1cd285fe06088d6dad58a3b52c071579aa0ce8b8 (patch) | |
| tree | 91395e9fefcce57f03f918419ffb14eb86011a0e /Source/cmQtAutoGenerators.h | |
| parent | a87f82e0258148f3047a3487c832a569dd841e09 (diff) | |
| download | CMake-1cd285fe06088d6dad58a3b52c071579aa0ce8b8.zip CMake-1cd285fe06088d6dad58a3b52c071579aa0ce8b8.tar.gz CMake-1cd285fe06088d6dad58a3b52c071579aa0ce8b8.tar.bz2 | |
Autogen: Remove rcc code from cmQtAutoGenerators
Diffstat (limited to 'Source/cmQtAutoGenerators.h')
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index a7bb538..b6e28b3 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -80,15 +80,6 @@ private: std::string IncludeString; }; - /// @brief RCC job - struct RccJob - { - std::string QrcFile; - std::string RccFile; - std::vector<std::string> Options; - std::vector<std::string> Inputs; - }; - // -- Initialization bool InitInfoFile(cmMakefile* makefile, std::string const& targetDirectory, std::string const& config); @@ -98,8 +89,7 @@ private: bool SettingsFileWrite(); bool SettingsChanged() const { - return (this->MocSettingsChanged || this->RccSettingsChanged || - this->UicSettingsChanged); + return (this->MocSettingsChanged || this->UicSettingsChanged); } // -- Central processing @@ -146,11 +136,6 @@ private: bool UicGenerateAll(); bool UicGenerateFile(const UicJob& uicJob); - // -- Rcc - bool RccEnabled() const { return !this->RccExecutable.empty(); } - bool RccGenerateAll(); - bool RccGenerateFile(const RccJob& rccJob); - // -- Log info void LogBold(std::string const& message) const; void LogInfo(cmQtAutoGen::Generator genType, @@ -193,7 +178,6 @@ private: std::string SettingsFile; std::string SettingsStringMoc; std::string SettingsStringUic; - std::string SettingsStringRcc; // -- Directories std::string ProjectSourceDir; std::string ProjectBinaryDir; @@ -206,7 +190,6 @@ private: std::string QtMinorVersion; std::string MocExecutable; std::string UicExecutable; - std::string RccExecutable; // -- File lists std::map<std::string, SourceJob> HeaderJobs; std::map<std::string, SourceJob> SourceJobs; @@ -240,9 +223,6 @@ private: std::vector<std::string> UicSearchPaths; cmsys::RegularExpression UicRegExpInclude; std::vector<std::unique_ptr<UicJob>> UicJobs; - // -- Rcc - bool RccSettingsChanged; - std::vector<RccJob> RccJobs; }; #endif |