Merge branch 'enable_press_and_hold_configuration_again' into 'mer-5.6'

[qtbase] Add configuration support for press and hold interval. Contributes to JB#44007

See merge request mer-core/qtbase!39

src/platformsupport/themes/genericunix/qgenericunixthemes.cpp

@@ -136,6 +136,7 @@ class QGenericUnixThemePrivate : public QPlatformThemePrivate
         keyboardScheme = settings.value(QStringLiteral("GenericUnixTheme/KeyboardScheme"), static_cast<int>(QPlatformTheme::X11KeyboardScheme));
         passwordMaskDelay = settings.value(QStringLiteral("GenericUnixTheme/PasswordMaskDelay"), 1000);
         startDragDistance = settings.value(QStringLiteral("GenericUnixTheme/StartDragDistance"), 20);
+        mousePressAndHoldInterval = settings.value(QStringLiteral("GenericUnixTheme/MousePressAndHoldInterval"), 600);
     }
 
     QFont systemFont;
@@ -147,6 +148,7 @@ class QGenericUnixThemePrivate : public QPlatformThemePrivate
     QVariant keyboardScheme;
     QVariant passwordMaskDelay;
     QVariant startDragDistance;
+    QVariant mousePressAndHoldInterval;
 };
 
 QGenericUnixTheme::QGenericUnixTheme()
@@ -219,6 +221,8 @@ QVariant QGenericUnixTheme::themeHint(ThemeHint hint) const
         return d->passwordMaskDelay;
     case QPlatformTheme::StartDragDistance:
         return d->startDragDistance;
+    case QPlatformTheme::MousePressAndHoldInterval:
+        return d->mousePressAndHoldInterval;
     default:
         break;
     }