diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
| commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
| tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /src/widgets/itemviews/qtableview.cpp | |
| parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
| parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) | |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'src/widgets/itemviews/qtableview.cpp')
| -rw-r--r-- | src/widgets/itemviews/qtableview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index e010c6977e..e84325c730 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -1011,10 +1011,10 @@ void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItem & its appearance in other styles. \table 100% - \row \li \inlineimage windowsxp-tableview.png Screenshot of a Windows XP style table view + \row \li \inlineimage windowsvista-tableview.png Screenshot of a Windows Vista style table view \li \inlineimage macintosh-tableview.png Screenshot of a Macintosh style table view \li \inlineimage fusion-tableview.png Screenshot of a Fusion style table view - \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} table view. + \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} table view. \li A \l{Macintosh Style Widget Gallery}{Macintosh style} table view. \li A \l{Fusion Style Widget Gallery}{Fusion style} table view. \endtable |