summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mira <samuel.mira@qt.io>2022-03-08 16:32:51 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-14 11:04:44 +0000
commit2e4f62332b9abc52deff8d8767a32e6270777873 (patch)
tree8bbc016d3e000b123379ce7f86cbd87228e2d3a0
parentf2cb165de73d0e7c0f742d5ecbe2ae165dd4e221 (diff)
Fix quick file dialog on android
Patch 13399bd54d084ed837ec061ca9315dbd173f3b48 removed the accept handler on QQuickFileDialog, which was triggering setSelectFiles on android. So changed qandroidplatformfiledialoghelper to also emit currentChanged which will trigger the QQuickFileDialog to setSelectFiles since there is a connect to that signal. Emitting currentChanged signal is also the signal used in others QPlatformFileDialogHelpers. Fixes: QTBUG-101013 Change-Id: I22f2d583f4be26a83e1c19190458fb5011e40095 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 2edc0025fa6d5a0f9c1c0d3811fac4bd8f3831c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
index 1ec5867a38..76ecd73336 100644
--- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
+++ b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
@@ -80,6 +80,7 @@ bool QAndroidPlatformFileDialogHelper::handleActivityResult(jint requestCode, ji
takePersistableUriPermission(uri);
m_selectedFile.append(QUrl(uri.toString()));
Q_EMIT fileSelected(m_selectedFile.first());
+ Q_EMIT currentChanged(m_selectedFile.first());
Q_EMIT accept();
return true;
@@ -98,6 +99,7 @@ bool QAndroidPlatformFileDialogHelper::handleActivityResult(jint requestCode, ji
m_selectedFile.append(itemUri.toString());
}
Q_EMIT filesSelected(m_selectedFile);
+ Q_EMIT currentChanged(m_selectedFile.first());
Q_EMIT accept();
}