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

AndroidManager::checkForQt51Files: Make parameter a Utils::FileName

Browse Source 
Change-Id: I2944f6c36fee7b362ef7dbbf1053954c41607fe8
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
BogDan Vatra
2014-06-24 16:47:10 +02:00
committed by Daniel Teske
parent 5211591e5a
commit c55d9a8e17
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -170,7 +170,7 @@ void AndroidDeployQtStep::ctor()
bool AndroidDeployQtStep::init() 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); 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()); m_targetArch = AndroidManager::targetArch(target());

2
src/plugins/android/androiddeployqtwidget.cpp
View File

@@ -98,7 +98,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
m_ui->verboseOutputCheckBox->setChecked(m_step->verboseOutput()); m_ui->verboseOutputCheckBox->setChecked(m_step->verboseOutput());
m_ui->openPackageLocationCheckBox->setChecked(m_step->openPackageLocation()); 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->oldFilesWarningIcon->setVisible(oldFiles);
m_ui->oldFilesWarningLabel->setVisible(oldFiles); m_ui->oldFilesWarningLabel->setVisible(oldFiles);

3
src/plugins/android/androidmanager.cpp
View File

@@ -1305,9 +1305,8 @@ bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const
return proc.exitCode() == 0; 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")); fileName.appendPath(QLatin1String("android")).appendPath(QLatin1String("version.xml"));
if (!fileName.toFileInfo().exists()) if (!fileName.toFileInfo().exists())
return false; return false;

2
src/plugins/android/androidmanager.h
View File

@@ -135,7 +135,7 @@ public:
static bool checkKeystorePassword(const QString &keystorePath, const QString &keystorePasswd); 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 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: private:
static void raiseError(const QString &reason); static void raiseError(const QString &reason);
static bool openXmlFile(QDomDocument &doc, const Utils::FileName &fileName); static bool openXmlFile(QDomDocument &doc, const Utils::FileName &fileName);