diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-04-06 10:39:33 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2019-04-06 15:37:12 (GMT) |
| commit | 9710d4aacf801d3dc7ab243bc2c8e051a65871a6 (patch) | |
| tree | dbead373bfa976cdebdbaec546559ca10b190a7e /Source/cmQtAutoGenerator.h | |
| parent | 95e72c0157ecd9c603fc541fa7e9fa246b777969 (diff) | |
| download | CMake-9710d4aacf801d3dc7ab243bc2c8e051a65871a6.zip CMake-9710d4aacf801d3dc7ab243bc2c8e051a65871a6.tar.gz CMake-9710d4aacf801d3dc7ab243bc2c8e051a65871a6.tar.bz2 | |
Autogen: Move libuv loop from cmQtAutoGenerator to cmQtAutoGeneratorMocUic
`cmQtAutoGenerator` automatically started a libuv loop in the constructor.
The loop is needed in `cmQtAutoGeneratorMocUic`, but not in
`cmQtAutoGeneratorRcc` (anymore). To avoid starting the loop in
`cmQtAutoGeneratorRcc`, this patch moves the loop variables and startup code
from `cmQtAutoGenerator` to `cmQtAutoGeneratorMocUic`.
Diffstat (limited to 'Source/cmQtAutoGenerator.h')
| -rw-r--r-- | Source/cmQtAutoGenerator.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/cmQtAutoGenerator.h b/Source/cmQtAutoGenerator.h index 862b18d..479d357 100644 --- a/Source/cmQtAutoGenerator.h +++ b/Source/cmQtAutoGenerator.h @@ -8,7 +8,6 @@ #include "cmFilePathChecksum.h" #include "cmQtAutoGen.h" #include "cmUVHandlePtr.h" -#include "cmUVSignalHackRAII.h" // IWYU pragma: keep #include "cm_uv.h" #include <array> @@ -249,9 +248,6 @@ public: std::string const& InfoFile() const { return InfoFile_; } std::string const& InfoDir() const { return InfoDir_; } std::string const& InfoConfig() const { return InfoConfig_; } - // libuv loop - uv_loop_t* UVLoop() { return UVLoop_.get(); } - cm::uv_async_ptr& UVRequest() { return UVRequest_; } // -- Utility static std::string SettingsFind(std::string const& content, const char* key); @@ -266,12 +262,6 @@ private: std::string InfoFile_; std::string InfoDir_; std::string InfoConfig_; -// -- libuv loop -#ifdef CMAKE_UV_SIGNAL_HACK - std::unique_ptr<cmUVSignalHackRAII> UVHackRAII_; -#endif - std::unique_ptr<uv_loop_t> UVLoop_; - cm::uv_async_ptr UVRequest_; }; #endif |