From 41ef1afa2c73146fd990f45ee14e3f4e50b8131b Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Mon, 25 Jan 2016 13:41:29 +0100
Subject: [PATCH] QMakeAndroid: Build- and warning fixes
Change-Id: I04b0849eeb2991b03892fcc97cb65a2f5ace5805
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
.../qmakeandroidsupport/qmakeandroidsupport.cpp | 2 +-
.../qmakeandroidsupport/qmakeandroidsupport.h | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
index e030c26a36b..49aac49255b 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 ce12534e48e..1a9e4f69c3a 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
--
GitLab