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

Even more FileName::appendPath() -> pathAppended()

Browse Source 
Change-Id: I0a8bc391ff3704e14df87e4fa3bc82269146f943
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-05-17 13:20:41 +02:00
parent 339f26aec1
commit eb9e3c807c
9 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidsettingswidget.cpp
View File

@@ -377,8 +377,7 @@ void AndroidSettingsWidget::validateJdk()
auto summaryWidget = static_cast<SummaryWidget *>(m_ui->javaDetailsWidget->widget());
summaryWidget->setPointValid(JavaPathExistsRow, jdkPathExists);
Utils::FileName bin = m_androidConfig.openJDKLocation();
bin.appendPath(QLatin1String("bin/javac" QTC_HOST_EXE_SUFFIX));
const Utils::FileName bin = m_androidConfig.openJDKLocation().pathAppended("bin/javac" QTC_HOST_EXE_SUFFIX);
summaryWidget->setPointValid(JavaJdkValidRow, jdkPathExists && bin.exists());
updateUI();
}
@@ -391,12 +390,9 @@ void AndroidSettingsWidget::validateNdk()
auto summaryWidget = static_cast<SummaryWidget *>(m_ui->androidDetailsWidget->widget());
summaryWidget->setPointValid(NdkPathExistsRow, m_androidConfig.ndkLocation().exists());
Utils::FileName ndkPlatformsDir(ndkPath);
ndkPlatformsDir.appendPath("platforms");
Utils::FileName ndkToolChainsDir(ndkPath);
ndkToolChainsDir.appendPath("toolchains");
Utils::FileName ndkSourcesDir(ndkPath);
ndkSourcesDir.appendPath("sources/cxx-stl");
const Utils::FileName ndkPlatformsDir = ndkPath.pathAppended("platforms");
const Utils::FileName ndkToolChainsDir = ndkPath.pathAppended("toolchains");
const Utils::FileName ndkSourcesDir = ndkPath.pathAppended("sources/cxx-stl");
summaryWidget->setPointValid(NdkDirStructureRow,
ndkPlatformsDir.exists()
&& ndkToolChainsDir.exists()