1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move DialogButtonBoxLayout case to be before MouseDoubleClickDistance

Browse Source 
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)
This commit is contained in:
Andy Shaw 2019-08-28 08:16:12 +02:00
parent cc1dc42c1f
commit e8b3593ecb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/android/qandroidplatformtheme.cpp
View File

@ -464,7 +464,8 @@ QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const
return QStringList(QLatin1String("android")); return QStringList(QLatin1String("android"));
} }
return QStringList(QLatin1String("fusion")); return QStringList(QLatin1String("fusion"));
case DialogButtonBoxLayout:
return QVariant(QPlatformDialogHelper::AndroidLayout);
case MouseDoubleClickDistance: case MouseDoubleClickDistance:
{ {
int minimumDistance = qEnvironmentVariableIntValue("QT_ANDROID_MINIMUM_MOUSE_DOUBLE_CLICK_DISTANCE"); int minimumDistance = qEnvironmentVariableIntValue("QT_ANDROID_MINIMUM_MOUSE_DOUBLE_CLICK_DISTANCE");
@ -488,8 +489,6 @@ QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const
Q_FALLTHROUGH(); Q_FALLTHROUGH();
} }
case DialogButtonBoxLayout:
return QVariant(QPlatformDialogHelper::AndroidLayout);
default: default:
return QPlatformTheme::themeHint(hint); return QPlatformTheme::themeHint(hint);
} }