diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-08-30 21:13:10 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-09-07 15:53:19 (GMT) |
| commit | d8d064abbc10239cf61655da31d3e6a4a46298e7 (patch) | |
| tree | bccc6ce5924ba62aa1e249eabb3a5a8389648206 /Source/cmQtAutoGen.h | |
| parent | 37714f884be3c37fbbcbf7bbef0ceb3b44cc5961 (diff) | |
| download | CMake-d8d064abbc10239cf61655da31d3e6a4a46298e7.zip CMake-d8d064abbc10239cf61655da31d3e6a4a46298e7.tar.gz CMake-d8d064abbc10239cf61655da31d3e6a4a46298e7.tar.bz2 | |
Autogen: Use the same algorithm for RCC and UIC option merging
Diffstat (limited to 'Source/cmQtAutoGen.h')
| -rw-r--r-- | Source/cmQtAutoGen.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmQtAutoGen.h b/Source/cmQtAutoGen.h index 88fd0fc..4cd5e32 100644 --- a/Source/cmQtAutoGen.h +++ b/Source/cmQtAutoGen.h @@ -34,6 +34,16 @@ public: /// static std::string Quoted(const std::string& text); + /// @brief Merges newOpts into baseOpts + static void UicMergeOptions(std::vector<std::string>& baseOpts, + const std::vector<std::string>& newOpts, + bool isQt5); + + /// @brief Merges newOpts into baseOpts + static void RccMergeOptions(std::vector<std::string>& baseOpts, + const std::vector<std::string>& newOpts, + bool isQt5); + /// @brief Reads the resource files list from from a .qrc file /// @arg fileName Must be the absolute path of the .qrc file /// @return True if the rcc file was successfully parsed |