diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-28 15:00:54 +0200 |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-28 15:00:54 +0200 |
| commit | f3a36a7e59b24bc388ed15372f941bf649bc5ae4 (patch) | |
| tree | 5486e561a12afc189ad0451c4cadf0f85e105328 /src/gui/widgets/qtabbar.cpp | |
| parent | b0885663f2192eb5eb27f8a8032e7e05b19e3736 (diff) | |
| parent | f9d6862d13ae38c59ec4a58092c8126620801e0b (diff) | |
| download | qt4-tools-f3a36a7e59b24bc388ed15372f941bf649bc5ae4.tar.gz | |
Merge commit 'origin/4.5' into 4.6
Reviewed-by: Joao
Conflicts:
src/gui/graphicsview/qgraphicsview.cpp
src/gui/widgets/qspinbox.cpp
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'src/gui/widgets/qtabbar.cpp')
| -rw-r--r-- | src/gui/widgets/qtabbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index 92e4eb4f50..6c9761c94a 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -1100,7 +1100,7 @@ QVariant QTabBar::tabData(int index) const } /*! - Returns the visual rectangle of the of the tab at position \a + Returns the visual rectangle of the tab at position \a index, or a null rectangle if \a index is out of range. */ QRect QTabBar::tabRect(int index) const |