|
@@ -51,6 +51,10 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
|
|
|
const char* targetName = target->GetName();
|
|
const char* targetName = target->GetName();
|
|
|
// don't do anything if there is no Qt4:
|
|
// don't do anything if there is no Qt4:
|
|
|
std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
|
|
std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
|
|
|
|
|
+ if (qtMajorVersion == "")
|
|
|
|
|
+ {
|
|
|
|
|
+ qtMajorVersion = makefile->GetSafeDefinition("Qt5SrcTools_VERSION_MAJOR");
|
|
|
|
|
+ }
|
|
|
if (qtMajorVersion != "4" && qtMajorVersion != "5")
|
|
if (qtMajorVersion != "4" && qtMajorVersion != "5")
|
|
|
{
|
|
{
|
|
|
return;
|
|
return;
|
|
@@ -215,6 +219,10 @@ bool cmQtAutomoc::ReadAutomocInfoFile(cmMakefile* makefile,
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
this->QtMajorVersion = makefile->GetSafeDefinition("AM_QT_VERSION_MAJOR");
|
|
this->QtMajorVersion = makefile->GetSafeDefinition("AM_QT_VERSION_MAJOR");
|
|
|
|
|
+ if (this->QtMajorVersion == "")
|
|
|
|
|
+ {
|
|
|
|
|
+ this->QtMajorVersion = makefile->GetSafeDefinition("AM_Qt5SrcTools_VERSION_MAJOR");
|
|
|
|
|
+ }
|
|
|
this->Sources = makefile->GetSafeDefinition("AM_SOURCES");
|
|
this->Sources = makefile->GetSafeDefinition("AM_SOURCES");
|
|
|
this->Headers = makefile->GetSafeDefinition("AM_HEADERS");
|
|
this->Headers = makefile->GetSafeDefinition("AM_HEADERS");
|
|
|
this->IncludeProjectDirsBefore = makefile->IsOn(
|
|
this->IncludeProjectDirsBefore = makefile->IsOn(
|