diff options
| author | Soheil Armin <soheil.armin@qt.io> | 2024-09-05 00:05:10 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-09-10 00:22:41 +0000 |
| commit | 8fa8607c82fe79951b5a4db6b1f81be5d57fafee (patch) | |
| tree | b3976c3cd59fc4819f4fff7004ceba4a519d9311 | |
| parent | a6e32c939e8d34839a74f97a4265aeb45266e52d (diff) | |
Android: Indicate signals with no params with QVariant<void*>
Previously we were sending an invalid QVariant if the emitted
signal had no parameters. Distinction between an invalid
QVariant and a artificial one was not possible in the
Android type converter.
In this change, we create a QVariant from void* that can be
detected as "void" signal during type conversion.
Fixes: QTBUG-128586
Change-Id: I6371e25399801c8407e729bfa001ce61dd51dfbb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
(cherry picked from commit 08f085918ce517199a6e53790a4d3f61fa29b278)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quick/platform/android/qandroidviewsignalmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/platform/android/qandroidviewsignalmanager.cpp b/src/quick/platform/android/qandroidviewsignalmanager.cpp index 52cecc743a..d8cb5fe3d4 100644 --- a/src/quick/platform/android/qandroidviewsignalmanager.cpp +++ b/src/quick/platform/android/qandroidviewsignalmanager.cpp @@ -11,7 +11,8 @@ QT_BEGIN_NAMESPACE void QAndroidViewSignalManager::forwardSignal() { - invokeListener(sender(), senderSignalIndex(), QVariant()); + // We use VoidStar because creating QVariant from QtMetaType::Void is not possible + invokeListener(sender(), senderSignalIndex(), QVariant::fromValue<void *>(nullptr)); } void QAndroidViewSignalManager::forwardSignal(int signalValue) |