feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QMakeAndroid: Build- and warning fixes

Browse Source 
Change-Id: I04b0849eeb2991b03892fcc97cb65a2f5ace5805
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-25 13:41:29 +01:00
parent 4320505501
commit 41ef1afa2c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
View File

@@ -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);
}

14
src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
View File

@@ -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