Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Update changelog after last change.
  QTabBar: smaller minimumSizeHint in ElideMode, and unit-test.
  Fix tab stop in QPainter::drawText()

4 files changed, 53 insertions, 5 deletions

diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0
index 39ea604..27bb885 100644
--- a/dist/changes-4.8.0
+++ b/dist/changes-4.8.0
@@ -40,6 +40,8 @@ QtCore
 QtGui
 -----
 
+ - QTabBar: reduced minimumSizeHint if ElideMode is set.
+
 
 ****************************************************************************
 *                          Database Drivers                                *
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 898a996..fbeb6e6 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -7906,6 +7906,9 @@ start_lengthVariant:
         engine.option = *option;
     }
 
+    if (engine.option.tabStop() < 0 && tabstops > 0)
+        engine.option.setTabStop(tabstops);
+
     engine.option.setTextDirection(layout_direction);
     if (tf & Qt::AlignJustify)
         engine.option.setAlignment(Qt::AlignJustify);
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index d03a2f4..387cddd 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -1235,6 +1235,8 @@ QSize QTabBar::sizeHint() const
 QSize QTabBar::minimumSizeHint() const
 {
     Q_D(const QTabBar);
+    if (d->layoutDirty)
+        const_cast<QTabBarPrivate*>(d)->layoutTabs();
     if (!d->useScrollButtons) {
         QRect r;
         for (int i = 0; i < d->tabList.count(); ++i)
@@ -1247,22 +1249,23 @@ QSize QTabBar::minimumSizeHint() const
         return QSize(d->rightB->sizeHint().width() * 2 + 75, sizeHint().height());
 }
 
+// Compute the most-elided possible text, for minimumSizeHint
 static QString computeElidedText(Qt::TextElideMode mode, const QString &text)
 {
-    if (text.length() <= 7)
+    if (text.length() <= 3)
         return text;
 
     static const QLatin1String Ellipses("...");
     QString ret;
     switch (mode) {
     case Qt::ElideRight:
-        ret = text.left(4) + Ellipses;
+        ret = text.left(2) + Ellipses;
         break;
     case Qt::ElideMiddle:
-        ret = text.left(2) + Ellipses + text.right(2);
+        ret = text.left(1) + Ellipses + text.right(1);
         break;
     case Qt::ElideLeft:
-        ret = Ellipses + text.right(4);
+        ret = Ellipses + text.right(2);
         break;
     case Qt::ElideNone:
         ret = text;
@@ -1909,7 +1912,7 @@ void QTabBar::keyPressEvent(QKeyEvent *event)
         event->ignore();
         return;
     }
-    int offset = event->key() == (isRightToLeft() ? Qt::Key_Right : Qt::Key_Left) ? -1 : 1;    
+    int offset = event->key() == (isRightToLeft() ? Qt::Key_Right : Qt::Key_Left) ? -1 : 1;
     d->setCurrentNextEnabledIndex(offset);
 }
 
diff --git a/tests/auto/qtabbar/tst_qtabbar.cpp b/tests/auto/qtabbar/tst_qtabbar.cpp
index ac3de20..5819c3c 100644
--- a/tests/auto/qtabbar/tst_qtabbar.cpp
+++ b/tests/auto/qtabbar/tst_qtabbar.cpp
@@ -76,6 +76,7 @@ private slots:
 
     void setElideMode_data();
     void setElideMode();
+    void sizeHints();
 
     void setUsesScrollButtons_data();
     void setUsesScrollButtons();
@@ -280,6 +281,45 @@ void tst_QTabBar::setElideMode()
     QTEST(int(tabBar.elideMode()), "expectedMode");
 }
 
+void tst_QTabBar::sizeHints()
+{
+    QTabBar tabBar;
+    tabBar.setFont(QFont("Arial", 10));
+    tabBar.addTab("tab 01");
+    tabBar.addTab("tab 02");
+    tabBar.addTab("tab 03");
+    tabBar.addTab("tab 04");
+    tabBar.addTab("tab 05");
+    tabBar.addTab("tab 06");
+    tabBar.addTab("This is tab7");
+    tabBar.addTab("This is tab8");
+    tabBar.addTab("This is tab9 with a very long title");
+
+    // No eliding and no scrolling -> tabbar becomes very wide
+    tabBar.setUsesScrollButtons(false);
+    tabBar.setElideMode(Qt::ElideNone);
+//    qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint();
+    QVERIFY(tabBar.minimumSizeHint().width() > 700);
+    QVERIFY(tabBar.sizeHint().width() > 700);
+
+    // Scrolling enabled -> no reason to become very wide
+    tabBar.setUsesScrollButtons(true);
+ //   qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint();
+    QVERIFY(tabBar.minimumSizeHint().width() < 200);
+    QVERIFY(tabBar.sizeHint().width() > 700); // unchanged
+
+    // Eliding enabled -> no reason to become very wide
+    tabBar.setUsesScrollButtons(false);
+    tabBar.setElideMode(Qt::ElideRight);
+//    qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint();
+    QVERIFY(tabBar.minimumSizeHint().width() < 500);
+    QVERIFY(tabBar.sizeHint().width() > 700); // unchanged
+
+    tabBar.addTab("This is tab10 with a very long title");
+    QVERIFY(tabBar.minimumSizeHint().width() < 600);
+    QVERIFY(tabBar.sizeHint().width() > 700); // unchanged
+}
+
 void tst_QTabBar::setUsesScrollButtons_data()
 {
     QTest::addColumn<int>("usesArrows");