diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2018-08-13 10:06:19 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2018-08-13 16:12:47 (GMT) |
| commit | 3aa11f31fcb9780d6e54647a97ca876a2a409251 (patch) | |
| tree | 028811cfd2b61b280538392a6dc93771f127962c /Source/cmGlobalGenerator.cxx | |
| parent | 1d87c9f318b45ba9984378580d5b4926acfd4c11 (diff) | |
| download | CMake-3aa11f31fcb9780d6e54647a97ca876a2a409251.zip CMake-3aa11f31fcb9780d6e54647a97ca876a2a409251.tar.gz CMake-3aa11f31fcb9780d6e54647a97ca876a2a409251.tar.bz2 | |
Autogen: Use integers to store the Qt version
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 324b56a..4060269 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -34,6 +34,7 @@ #include "cmMakefile.h" #include "cmOutputConverter.h" #include "cmPolicies.h" +#include "cmQtAutoGen.h" #include "cmQtAutoGenInitializer.h" #include "cmSourceFile.h" #include "cmState.h" @@ -1495,15 +1496,14 @@ bool cmGlobalGenerator::QtAutoGen() continue; } - std::string qtVersionMajor = - cmQtAutoGenInitializer::GetQtMajorVersion(target); + auto qtVersion = cmQtAutoGenInitializer::GetQtVersion(target); // don't do anything if there is no Qt4 or Qt5Core (which contains moc) - if (qtVersionMajor != "4" && qtVersionMajor != "5") { + if (qtVersion.Major != 4 && qtVersion.Major != 5) { continue; } autogenInits.emplace_back(cm::make_unique<cmQtAutoGenInitializer>( - target, mocEnabled, uicEnabled, rccEnabled, qtVersionMajor)); + target, mocEnabled, uicEnabled, rccEnabled, qtVersion)); } } |