summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2019-08-28 08:16:12 +0200
committerAndy Shaw <andy.shaw@qt.io>2019-09-24 07:16:25 +0000
commite8b3593ecb8b48ec53309b923ac8a642992768cd (patch)
tree20673d8126283ac8ae4cf0e7c83019eda04e97d6
parentcc1dc42c1f78f0f1e7899a446e7ce181f2f85824 (diff)
Move DialogButtonBoxLayout case to be before MouseDoubleClickDistance
This amends 9be66cb282dee1ce4380602a2f3caf5abfd144cf so that the DialogButtonBoxLayout case is moved to be before the MouseDoubleClickDistance one in case the fallthrough is triggered. Change-Id: I843dad6b55ccffe6b6c275cd75587f04659e512f Reviewed-by: BogDan Vatra <bogdan@kdab.com> (cherry picked from commit 54d3059ccfe6df0a375d2addac4ad41333122b8d)
-rw-r--r--src/plugins/platforms/android/qandroidplatformtheme.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp
index 94405738f3..8d98d4ba8d 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.cpp
+++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp
@@ -464,7 +464,8 @@ QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const
return QStringList(QLatin1String("android"));
}
return QStringList(QLatin1String("fusion"));
-
+ case DialogButtonBoxLayout:
+ return QVariant(QPlatformDialogHelper::AndroidLayout);
case MouseDoubleClickDistance:
{
int minimumDistance = qEnvironmentVariableIntValue("QT_ANDROID_MINIMUM_MOUSE_DOUBLE_CLICK_DISTANCE");
@@ -488,8 +489,6 @@ QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const
Q_FALLTHROUGH();
}
- case DialogButtonBoxLayout:
- return QVariant(QPlatformDialogHelper::AndroidLayout);
default:
return QPlatformTheme::themeHint(hint);
}