Commit 2df6d690 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

AutoGen: query Qt5 version from directory properties

This allows functions which enable AutoGen to make the version variables
available at generate time.

See: #18732
parent b598dfb6
......@@ -1281,6 +1281,12 @@ cmQtAutoGenInitializer::IntegerVersion cmQtAutoGenInitializer::GetQtVersion(
if (qtMajor.empty()) {
qtMajor = makefile->GetSafeDefinition("Qt5Core_VERSION_MAJOR");
}
if (qtMajor.empty()) {
const char* dirprop = makefile->GetProperty("Qt5Core_VERSION_MAJOR");
if (dirprop) {
qtMajor = dirprop;
}
}
{
const char* targetQtVersion =
target->GetLinkInterfaceDependentStringProperty("QT_MAJOR_VERSION", "");
......@@ -1294,6 +1300,12 @@ cmQtAutoGenInitializer::IntegerVersion cmQtAutoGenInitializer::GetQtVersion(
if (!qtMajor.empty()) {
if (qtMajor == "5") {
qtMinor = makefile->GetSafeDefinition("Qt5Core_VERSION_MINOR");
if (qtMinor.empty()) {
const char* dirprop = makefile->GetProperty("Qt5Core_VERSION_MINOR");
if (dirprop) {
qtMinor = dirprop;
}
}
}
if (qtMinor.empty()) {
qtMinor = makefile->GetSafeDefinition("QT_VERSION_MINOR");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment