Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: I70bce420ae7d82d1bd72ff3d6c4f034525272aba

2 files changed, 3 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index c82cdcd5..d8810fcd 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -587,6 +587,7 @@ void QQuickAbstractButton::keyPressEvent(QKeyEvent *event)
         }
 
         emit pressed();
+        event->accept();
     }
 }
 
@@ -603,6 +604,7 @@ void QQuickAbstractButton::keyReleaseEvent(QKeyEvent *event)
 
         if (d->autoRepeat)
             d->stopPressRepeat();
+        event->accept();
     }
 }
 
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 25a5b24f..73a0a0db 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -1194,6 +1194,7 @@ void QQuickControl::componentComplete()
 {
     Q_D(QQuickControl);
     QQuickItem::componentComplete();
+    d->resizeContent();
     if (!d->hasLocale)
         d->locale = QQuickControlPrivate::calcLocale(d->parentItem);
     if (!d->explicitHoverEnabled)