diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp index e030c26a36beafd871ac4ab48c659e75b9739336..49aac49255b7a7297fa9c552d9c3e56dce1407cd 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp @@ -74,7 +74,7 @@ QStringList QmakeAndroidSupport::androidExtraLibs(const ProjectExplorer::Target if (!qarc) return QStringList(); auto project = static_cast<QmakeProject *>(target->project()); - QmakeProFileNode *node = project->rootQmakeProjectNode()->findProFileFor(qarc->proFilePath()); + QmakeProFileNode *node = project->rootProjectNode()->findProFileFor(qarc->proFilePath()); return node->variableValue(QmakeProjectManager::AndroidExtraLibs); } diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h index ce12534e48e6268bb232a2874e65d580decee1fc..1a9e4f69c3a7224100027253f3a75693c694581a 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h @@ -36,15 +36,15 @@ class QmakeAndroidSupport : public Android::AndroidQtSupport Q_OBJECT public: - bool canHandle(const ProjectExplorer::Target *target) const; - QStringList soLibSearchPath(const ProjectExplorer::Target *target) const; + bool canHandle(const ProjectExplorer::Target *target) const override; + QStringList soLibSearchPath(const ProjectExplorer::Target *target) const override; QStringList androidExtraLibs(const ProjectExplorer::Target *target) const override; - QStringList projectTargetApplications(const ProjectExplorer::Target *target) const; - Utils::FileName androiddeployqtPath(ProjectExplorer::Target *target) const; - Utils::FileName androiddeployJsonPath(ProjectExplorer::Target *target) const; + QStringList projectTargetApplications(const ProjectExplorer::Target *target) const override; + Utils::FileName androiddeployqtPath(ProjectExplorer::Target *target) const override; + Utils::FileName androiddeployJsonPath(ProjectExplorer::Target *target) const override; - void manifestSaved(const ProjectExplorer::Target *target); - Utils::FileName manifestSourcePath(const ProjectExplorer::Target *target); + void manifestSaved(const ProjectExplorer::Target *target) override; + Utils::FileName manifestSourcePath(const ProjectExplorer::Target *target) override; }; } // namespace Internal