diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-07-09 12:34:00 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-07-09 12:34:00 (GMT) |
| commit | 6ee0091a966fe09256b6285a047ae2eff55622e2 (patch) | |
| tree | bd49657919035be26844bd54a334e1c59793af45 /src/gui/text/qtextoption.cpp | |
| parent | 653f180d4697e0c7ec1c58022622d5d140e7fda8 (diff) | |
| parent | 5f2437ae9a11c360139599b4d4b01270cd276a52 (diff) | |
| download | Qt-6ee0091a966fe09256b6285a047ae2eff55622e2.zip Qt-6ee0091a966fe09256b6285a047ae2eff55622e2.tar.gz Qt-6ee0091a966fe09256b6285a047ae2eff55622e2.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/text/qtextoption.cpp')
| -rw-r--r-- | src/gui/text/qtextoption.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp index 8f31e46..9eeec0b 100644 --- a/src/gui/text/qtextoption.cpp +++ b/src/gui/text/qtextoption.cpp @@ -392,7 +392,12 @@ QList<QTextOption::Tab> QTextOption::tabs() const /*! \fn Tab::Tab(qreal pos, TabType tabType, QChar delim = QChar()) - Creates a tab with the given position, tab type, and (for DelimiterTab) delimiter + + Creates a tab with the given position, tab type, and delimiter + (\a pos, \a tabType, \a delim). + + \note \a delim is only used when \a tabType is DelimiterTab. + \since 4.7 */ |