Merge remote-tracking branch 'origin/5.11' into 5.12

* origin/5.11:

  aa8e21c Add new Qt3D demo
  ca03367 Exclude demos from colibri imx6ull
  a5345fd qtwebbrowser: merge changes from qtwebbrowser git repo
  d7e9731 do not enable highdpiscaling on emulator
  f730907 Fix mediaplayer default video path
  09aa32d Fix some major scaling & font issues on ebike-demo

Change-Id: I044c29ea2908a6254f32b0623037ea63f23d25cb

1 files changed, 10 insertions, 13 deletions

diff --git a/basicsuite/ebike-ui/IconifiedTabButton.qml b/basicsuite/ebike-ui/IconifiedTabButton.qml
index 572ce51..4762d94 100644
--- a/basicsuite/ebike-ui/IconifiedTabButton.qml
+++ b/basicsuite/ebike-ui/IconifiedTabButton.qml
@@ -43,27 +43,24 @@ TabButton {
     property string selectedIcon
     property var bar
 
-    contentItem: Image {
-        width: UILayout.tabButtonIconWidth
-        height: UILayout.tabButtonIconHeight
-        source: bar.currentItem === parent ? selectedIcon : deselectedIcon
-        fillMode: Image.Pad
-        anchors {
-            top: parent.top
-            topMargin: UILayout.tabButtonTopMargin
-            horizontalCenter: parent.horizontalCenter
-        }
-    }
-
     background: Rectangle {
         color: Colors.tabBackground
-        height: parent.height
+
+        Image {
+            height: parent.height
+            width: height
+            source: bar.currentItem === parent.parent ? selectedIcon : deselectedIcon
+            fillMode: Image.PreserveAspectFit
+            anchors.centerIn: parent
+
+        }
 
         Rectangle {
             visible: bar.currentItem === parent.parent
             width: parent.width
             height: 2
             anchors.bottom: parent.bottom
+            anchors.bottomMargin: height
             color: Colors.activeTabBorder
         }
     }