diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-11-05 15:21:21 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-11-08 09:19:09 +0000 |
| commit | bcc5c9a344d27b08d5c629f763f54262da4efa93 (patch) | |
| tree | 6ee06bccda184ae3559707ebd9c3e66dfe127339 | |
| parent | d80f3f4d8a1399431b70f3d7d8d188163806c6e6 (diff) | |
Android: since jpg is allowd, add jpeg to icon/splash file dialog
Change-Id: I018650a33d681f4ea75c9333eb875a197ce96e3d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/android/androidmanifesteditoriconwidget.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/android/splashscreencontainerwidget.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/android/splashscreenwidget.cpp | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/android/androidmanifesteditoriconwidget.cpp b/src/plugins/android/androidmanifesteditoriconwidget.cpp index 3774a5cf00..1202c8ebc1 100644 --- a/src/plugins/android/androidmanifesteditoriconwidget.cpp +++ b/src/plugins/android/androidmanifesteditoriconwidget.cpp @@ -166,7 +166,7 @@ void AndroidManifestEditorIconWidget::selectIcon() { FilePath file = FileUtils::getOpenFilePath(this, m_iconSelectionText, FileUtils::homePath(), - tr("Images (*.png *.jpg *.webp *.svg)")); + tr("Images (*.png *.jpg *.jpeg *.webp *.svg)")); if (file.isEmpty()) return; setIconFromPath(file); diff --git a/src/plugins/android/splashscreencontainerwidget.cpp b/src/plugins/android/splashscreencontainerwidget.cpp index fbbada112e..a738b0ed12 100644 --- a/src/plugins/android/splashscreencontainerwidget.cpp +++ b/src/plugins/android/splashscreencontainerwidget.cpp @@ -62,7 +62,7 @@ const char splashscreenFileName[] = "logo"; const char splashscreenPortraitFileName[] = "logo_port"; const char splashscreenLandscapeFileName[] = "logo_land"; const char imageSuffix[] = ".png"; -const QString fileDialogImageFiles = QString(QWidget::tr("Images (*.png *.jpg)")); +const QString fileDialogImageFiles = QString(QWidget::tr("Images (*.png *.jpg *.jpeg)")); const QSize lowDpiImageSize{200, 320}; const QSize mediumDpiImageSize{320, 480}; const QSize highDpiImageSize{480, 800}; @@ -608,8 +608,8 @@ void SplashScreenContainerWidget::checkSplashscreenImage(const QString &name) for (const QString &path : paths) { const FilePath filePath = baseDir.pathAppended(path + name); - if (filePath.stringAppended(".png").exists() - || filePath.stringAppended(".jpg").exists()) { + if (filePath.stringAppended(".png").exists() || filePath.stringAppended(".jpg").exists() + || filePath.stringAppended(".jpeg").exists()) { setCurrentIndex(1); break; } diff --git a/src/plugins/android/splashscreenwidget.cpp b/src/plugins/android/splashscreenwidget.cpp index 23e5ddccb9..386e6802df 100644 --- a/src/plugins/android/splashscreenwidget.cpp +++ b/src/plugins/android/splashscreenwidget.cpp @@ -189,7 +189,8 @@ void SplashScreenWidget::selectImage() { const FilePath file = FileUtils::getOpenFilePath(this, m_imageSelectionText, FileUtils::homePath(), - QStringLiteral("%1 (*.png *.jpg)").arg(tr("Images"))); + QStringLiteral("%1 (*.png *.jpg *.jpeg)") + .arg(tr("Images"))); if (file.isEmpty()) return; setImageFromPath(file, false); |