diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-04 18:49:16 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-04 18:49:16 (GMT) |
| commit | 5980acde99d393010d7d713006e5d4c34d945cf7 (patch) | |
| tree | 60bf55ba19e40d80c2b48adf319529c9e9876d06 /src/gui/styles | |
| parent | 7905101fb5ef18c776be515b9287356b1efc5ceb (diff) | |
| parent | c1eae9d5842c73719d7719cccc4beca55711714d (diff) | |
| download | Qt-5980acde99d393010d7d713006e5d4c34d945cf7.zip Qt-5980acde99d393010d7d713006e5d4c34d945cf7.tar.gz Qt-5980acde99d393010d7d713006e5d4c34d945cf7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Conflicts:
src/gui/kernel/qevent.cpp
src/gui/kernel/qgesture.cpp
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qstyleoption.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp index f5a2b94..d73a563 100644 --- a/src/gui/styles/qstyleoption.cpp +++ b/src/gui/styles/qstyleoption.cpp @@ -4736,8 +4736,9 @@ QStyleOptionTabWidgetFrameV2::QStyleOptionTabWidgetFrameV2(const QStyleOptionTab QStyleOptionFrame types. If the \a{other} style option's version is 1, this style option's - \l FrameFeature value is set to \l QStyleOptionFrameV2::None. If - its version is 2, its \l FrameFeature value is simply copied to + QStyleOptionFrameV2::FrameFeature value is set to + QStyleOptionFrameV2::None. If its version is 2, its + \l{QStyleOptionFrameV2::}{FrameFeature} value is simply copied to this style option. */ QStyleOptionTabWidgetFrameV2 &QStyleOptionTabWidgetFrameV2::operator=(const QStyleOptionTabWidgetFrame &other) |