diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-21 12:51:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-21 12:51:54 (GMT) |
| commit | 4dba5d6ce251257259874bce394b2fba954e200c (patch) | |
| tree | f775a504eb80d0383231fb99eb301a962a989fb2 /Source/cmQtAutoGenInitializer.cxx | |
| parent | 7e5f9b192e9c3ed7130e1e52b7f9d3243f51e2ab (diff) | |
| parent | ef61997b1be5c2f542472f8eb48dac62cd26bf5c (diff) | |
| download | CMake-4dba5d6ce251257259874bce394b2fba954e200c.zip CMake-4dba5d6ce251257259874bce394b2fba954e200c.tar.gz CMake-4dba5d6ce251257259874bce394b2fba954e200c.tar.bz2 | |
Merge topic 'use-emplace'
ef61997b1b clang-tidy: Use emplace
2e5307a2a4 CTestSVN: Accept std::string in SVNInfo constructor
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2811
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 9fa8a89..1f61632 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -1482,7 +1482,7 @@ std::pair<bool, std::string> GetQtExecutable( if (cmSystemTools::FileExists(result, true)) { std::vector<std::string> command; command.push_back(result); - command.push_back("-h"); + command.emplace_back("-h"); std::string stdOut; std::string stdErr; int retVal = 0; @@ -1546,9 +1546,9 @@ bool cmQtAutoGenInitializer::GetRccExecutable() if (this->QtVersion.Major == 5 || this->QtVersion.Major == 6) { if (stdOut.find("--list") != std::string::npos) { - this->Rcc.ListOptions.push_back("--list"); + this->Rcc.ListOptions.emplace_back("--list"); } else { - this->Rcc.ListOptions.push_back("-list"); + this->Rcc.ListOptions.emplace_back("-list"); } } return true; |