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

Improve AndroidManifest.xml error dialog content

Browse Source 
Currently, if the AndroidManifest.xml file is not present in the
installation folder (e.g. failed make install), the error message
shown to the user just tells him that some operation failed. This patch
tries to be more verbose to give the user some clues for the failure
reason.

Task-number: QTCREATORBUG-11503
Change-Id: I013de394c87b3adb53ec86dd97433567d7f63049
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Samuel Gaist
2014-07-21 21:55:01 +02:00
parent f130c3c7e5
commit 22fe880628
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
View File

@@ -213,14 +213,21 @@ void CreateAndroidManifestWizard::setDirectory(const QString &directory)
m_directory = directory;
}
QString CreateAndroidManifestWizard::sourceFileName() const
QString CreateAndroidManifestWizard::sourceFolder() const
{
QString result;
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(m_target->kit());
if (!version)
return result;
return QString();
return version->qmakeProperty("QT_INSTALL_PREFIX");
}
QString CreateAndroidManifestWizard::sourceFileName() const
{
QString srcFolder = sourceFolder();
if (srcFolder.isEmpty())
return srcFolder;
Utils::FileName srcPath
= Utils::FileName::fromString(version->qmakeProperty("QT_INSTALL_PREFIX"))
= Utils::FileName::fromString(srcFolder)
.appendPath(QLatin1String("src/android/java"));
srcPath.appendPath(QLatin1String("AndroidManifest.xml"));
return srcPath.toString();
@@ -250,9 +257,20 @@ void CreateAndroidManifestWizard::createAndroidManifestFile()
}
}
if (!QFile::copy(sourceFileName(), fileName)) {
QString srcFileName = sourceFileName();
if (!QFileInfo(srcFileName).exists()) {
QMessageBox::warning(this, tr("File Creation Error"),
tr("Could not create file %1.").arg(fileName));
tr("\"%1\" is missing.\n"
"Check your Qt installation here:\n"
"\"%2\"").arg(fileName).arg(sourceFolder()));
return;
}
if (!QFile::copy(srcFileName, fileName)) {
QMessageBox::warning(this, tr("File Creation Error"),
tr("Could not create file %1.\n"
"Verify that you have writing rights in your project directory.").arg(fileName));
return;
}

1
src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h
View File

@@ -92,6 +92,7 @@ public:
QmakeProjectManager::QmakeProFileNode *node() const;
void setNode(QmakeProjectManager::QmakeProFileNode *node);
QString sourceFolder() const;
QString sourceFileName() const;
void accept();