|
|
@@ -809,7 +809,8 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget const* target,
|
|
|
autogenTargetName.c_str());
|
|
|
return;
|
|
|
}
|
|
|
- makefile->AddDefinition("_qt_moc_executable", qt5Moc->GetLocation(""));
|
|
|
+ makefile->AddDefinition("_qt_moc_executable",
|
|
|
+ qt5Moc->ImportedGetLocation(""));
|
|
|
}
|
|
|
else if (strcmp(qtVersion, "4") == 0)
|
|
|
{
|
|
|
@@ -820,7 +821,8 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget const* target,
|
|
|
autogenTargetName.c_str());
|
|
|
return;
|
|
|
}
|
|
|
- makefile->AddDefinition("_qt_moc_executable", qt4Moc->GetLocation(""));
|
|
|
+ makefile->AddDefinition("_qt_moc_executable",
|
|
|
+ qt4Moc->ImportedGetLocation(""));
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -967,7 +969,8 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget const* target,
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- makefile->AddDefinition("_qt_uic_executable", qt5Uic->GetLocation(""));
|
|
|
+ makefile->AddDefinition("_qt_uic_executable",
|
|
|
+ qt5Uic->ImportedGetLocation(""));
|
|
|
}
|
|
|
}
|
|
|
else if (strcmp(qtVersion, "4") == 0)
|
|
|
@@ -979,7 +982,8 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget const* target,
|
|
|
targetName.c_str());
|
|
|
return;
|
|
|
}
|
|
|
- makefile->AddDefinition("_qt_uic_executable", qt4Uic->GetLocation(""));
|
|
|
+ makefile->AddDefinition("_qt_uic_executable",
|
|
|
+ qt4Uic->ImportedGetLocation(""));
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -1171,7 +1175,7 @@ std::string cmQtAutoGenerators::GetRccExecutable(cmTarget const* target)
|
|
|
targetName.c_str());
|
|
|
return std::string();
|
|
|
}
|
|
|
- return qt5Rcc->GetLocation("");
|
|
|
+ return qt5Rcc->ImportedGetLocation("");
|
|
|
}
|
|
|
else if (strcmp(qtVersion, "4") == 0)
|
|
|
{
|
|
|
@@ -1182,7 +1186,7 @@ std::string cmQtAutoGenerators::GetRccExecutable(cmTarget const* target)
|
|
|
targetName.c_str());
|
|
|
return std::string();
|
|
|
}
|
|
|
- return qt4Rcc->GetLocation("");
|
|
|
+ return qt4Rcc->ImportedGetLocation("");
|
|
|
}
|
|
|
|
|
|
cmSystemTools::Error("The CMAKE_AUTORCC feature supports only Qt 4 and "
|