diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:48:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:49:18 +0100 |
| commit | dd756011da13b95fdb630a1bbb90234f1e60f415 (patch) | |
| tree | a6259b1e9b6463108796ce912e3d1752e301505f /src/widgets/widgets/qtabbar.cpp | |
| parent | 0c50edbe84914469973a3b10e0170023ccdd66fe (diff) | |
| parent | b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
configure.json
mkspecs/win32-icc/qmake.conf
Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
Diffstat (limited to 'src/widgets/widgets/qtabbar.cpp')
| -rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 37d0f751cb..9bf062b407 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -1447,7 +1447,7 @@ static QString computeElidedText(Qt::TextElideMode mode, const QString &text) /*! Returns the minimum tab size hint for the tab at position \a index. - \since Qt 5.0 + \since 5.0 */ QSize QTabBar::minimumTabSizeHint(int index) const |