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

Android: Try harder to find the right qmake project file

Browse Source 
... for adding the OpenSSL libs to.
For the typical Android case of a single application product, this will
do the right thing, and otherwise won't do anything worse than now.

Fixes: QTCREATORBUG-24255
Change-Id: I577f3cbd3fda086b8a7c7c5614d0ca79ff9d46f7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Kandeler
2021-11-30 13:21:14 +01:00
parent 46f611bee1
commit 684f5da066
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -139,6 +139,7 @@ private:
void signPackageCheckBoxToggled(bool checked); void signPackageCheckBoxToggled(bool checked);
void onOpenSslCheckBoxChanged(); void onOpenSslCheckBoxChanged();
bool isOpenSslLibsIncluded(); bool isOpenSslLibsIncluded();
FilePath appProjectFilePath() const;
QString openSslIncludeFileContent(const FilePath &projectPath); QString openSslIncludeFileContent(const FilePath &projectPath);
QWidget *createApplicationGroup(); QWidget *createApplicationGroup();
@@ -420,7 +421,7 @@ void AndroidBuildApkWidget::signPackageCheckBoxToggled(bool checked)
void AndroidBuildApkWidget::onOpenSslCheckBoxChanged() void AndroidBuildApkWidget::onOpenSslCheckBoxChanged()
{ {
Utils::FilePath projectPath = m_step->buildConfiguration()->buildSystem()->projectFilePath(); Utils::FilePath projectPath = appProjectFilePath();
QFile projectFile(projectPath.toString()); QFile projectFile(projectPath.toString());
if (!projectFile.open(QIODevice::ReadWrite | QIODevice::Text)) { if (!projectFile.open(QIODevice::ReadWrite | QIODevice::Text)) {
qWarning() << "Cannot open project file to add OpenSSL extra libs: " << projectPath; qWarning() << "Cannot open project file to add OpenSSL extra libs: " << projectPath;
@@ -442,9 +443,21 @@ void AndroidBuildApkWidget::onOpenSslCheckBoxChanged()
projectFile.close(); projectFile.close();
} }
FilePath AndroidBuildApkWidget::appProjectFilePath() const
{
const FilePath topLevelFile = m_step->buildConfiguration()->buildSystem()->projectFilePath();
if (topLevelFile.fileName() == "CMakeLists.txt")
return topLevelFile;
static const auto isApp = [](Node *n) { return n->asProjectNode()
&& n->asProjectNode()->productType() == ProductType::App; };
Node * const appNode = m_step->buildConfiguration()->project()->rootProjectNode()
->findNode(isApp);
return appNode ? appNode ->filePath() : topLevelFile;
}
bool AndroidBuildApkWidget::isOpenSslLibsIncluded() bool AndroidBuildApkWidget::isOpenSslLibsIncluded()
{ {
Utils::FilePath projectPath = m_step->buildConfiguration()->buildSystem()->projectFilePath(); Utils::FilePath projectPath = appProjectFilePath();
const QString searchStr = openSslIncludeFileContent(projectPath); const QString searchStr = openSslIncludeFileContent(projectPath);
QFile projectFile(projectPath.toString()); QFile projectFile(projectPath.toString());
projectFile.open(QIODevice::ReadOnly); projectFile.open(QIODevice::ReadOnly);