1 files changed, 17 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index 6fe734bb..bf6c4e74 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -113,16 +113,28 @@ void QQuickTabBarPrivate::updateLayout()
     Q_Q(QQuickTabBar);
     const int count = contentModel->count();
     if (count > 0 && contentItem) {
-        const qreal itemWidth = (contentItem->width() - qMax(0, count - 1) * spacing) / count;
+        qreal reservedWidth = 0;
+        QVector<QQuickItem *> resizableItems;
+        resizableItems.reserve(count);
 
         for (int i = 0; i < count; ++i) {
             QQuickItem *item = q->itemAt(i);
             if (item) {
                 QQuickItemPrivate *p = QQuickItemPrivate::get(item);
-                if (!p->widthValid) {
-                    item->setWidth(itemWidth);
-                    p->widthValid = false;
-                }
+                if (!p->widthValid)
+                    resizableItems += item;
+                else
+                    reservedWidth += item->width();
+            }
+        }
+
+        if (!resizableItems.isEmpty()) {
+            const qreal totalSpacing = qMax(0, count - 1) * spacing;
+            const qreal itemWidth = (contentItem->width() - reservedWidth - totalSpacing) / resizableItems.count();
+
+            for (QQuickItem *item : qAsConst(resizableItems)) {
+                item->setWidth(itemWidth);
+                QQuickItemPrivate::get(item)->widthValid = false;
             }
         }
     }