From c55d9a8e17228e125eb6cd51c752dfb42a7b3847 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 24 Jun 2014 16:47:10 +0200 Subject: [PATCH] AndroidManager::checkForQt51Files: Make parameter a Utils::FileName Change-Id: I2944f6c36fee7b362ef7dbbf1053954c41607fe8 Reviewed-by: BogDan Vatra --- src/plugins/android/androiddeployqtstep.cpp | 2 +- src/plugins/android/androiddeployqtwidget.cpp | 2 +- src/plugins/android/androidmanager.cpp | 3 +-- src/plugins/android/androidmanager.h | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index c755cd515eb..14bd592d37d 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -170,7 +170,7 @@ void AndroidDeployQtStep::ctor() bool AndroidDeployQtStep::init() { - if (AndroidManager::checkForQt51Files(project()->projectDirectory().toString())) + if (AndroidManager::checkForQt51Files(project()->projectDirectory())) emit addOutput(tr("Found old folder \"android\" in source directory. Qt 5.2 does not use that folder by default."), ErrorOutput); m_targetArch = AndroidManager::targetArch(target()); diff --git a/src/plugins/android/androiddeployqtwidget.cpp b/src/plugins/android/androiddeployqtwidget.cpp index bcafad77b49..b07ab8f827e 100644 --- a/src/plugins/android/androiddeployqtwidget.cpp +++ b/src/plugins/android/androiddeployqtwidget.cpp @@ -98,7 +98,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step) m_ui->verboseOutputCheckBox->setChecked(m_step->verboseOutput()); m_ui->openPackageLocationCheckBox->setChecked(m_step->openPackageLocation()); - bool oldFiles = AndroidManager::checkForQt51Files(m_step->project()->projectDirectory().toString()); + bool oldFiles = AndroidManager::checkForQt51Files(m_step->project()->projectDirectory()); m_ui->oldFilesWarningIcon->setVisible(oldFiles); m_ui->oldFilesWarningLabel->setVisible(oldFiles); diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index e6be2237d1d..2641d4519b8 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -1305,9 +1305,8 @@ bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const return proc.exitCode() == 0; } -bool AndroidManager::checkForQt51Files(const QString &projectDirectory) +bool AndroidManager::checkForQt51Files(Utils::FileName fileName) { - Utils::FileName fileName = Utils::FileName::fromString(projectDirectory); fileName.appendPath(QLatin1String("android")).appendPath(QLatin1String("version.xml")); if (!fileName.toFileInfo().exists()) return false; diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index ca5e35d63b2..5fe67c4bfc4 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -135,7 +135,7 @@ public: static bool checkKeystorePassword(const QString &keystorePath, const QString &keystorePasswd); static bool checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd, const QString &alias, const QString &certificatePasswd); - static bool checkForQt51Files(const QString &projectDirectory); + static bool checkForQt51Files(Utils::FileName fileName); private: static void raiseError(const QString &reason); static bool openXmlFile(QDomDocument &doc, const Utils::FileName &fileName);