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

Android: Don't remove icons or splashes if files with similar names exist

Browse Source 
Task-number: QTCREATORBUG-24879
Change-Id: Ie13a8a94534889c473414b5a5e771aae11d0f167
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Ville Voutilainen
2020-11-26 07:05:11 +02:00
parent d31f2219fd
commit 23501b4271
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidmanifesteditoriconwidget.cpp
View File

@@ -255,6 +255,17 @@ static QImage scaleWithoutStretching(const QImage& original, const QSize& target
return ret; return ret;
} }
static bool similarFilesExist(const QString &path)
{
QFileInfo fileInfo(path);
QDir imageDir(fileInfo.absolutePath());
QString baseName(fileInfo.completeBaseName());
baseName.append(QLatin1String(".*"));
imageDir.setNameFilters({baseName});
auto entries = imageDir.entryList();
return !entries.empty();
}
void AndroidManifestEditorIconWidget::copyIcon() void AndroidManifestEditorIconWidget::copyIcon()
{ {
if (m_targetIconPath.isEmpty()) if (m_targetIconPath.isEmpty())
@@ -269,7 +280,8 @@ void AndroidManifestEditorIconWidget::copyIcon()
if (m_iconPath != targetPath) if (m_iconPath != targetPath)
removeIcon(); removeIcon();
if (original.isNull()) { if (original.isNull()) {
m_iconPath.clear(); if (!similarFilesExist(m_iconPath))
m_iconPath.clear();
return; return;
} }
if (m_iconPath == targetPath) if (m_iconPath == targetPath)