diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-12 08:31:55 +0200 |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-12 08:31:55 +0200 |
| commit | f710d57af1cc03af143573135390e6c68eecbfe8 (patch) | |
| tree | 2b4f317509b101e2aa08d69225818054310e4d09 /src/gui/widgets | |
| parent | d22c8c60ffd986cc46d1f1cab878d60b03b5d4ea (diff) | |
| parent | f64ad3687c428644139690d565fe555ed2199aea (diff) | |
| download | qt4-tools-f710d57af1cc03af143573135390e6c68eecbfe8.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qframe.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qframe.cpp b/src/gui/widgets/qframe.cpp index c2e4b352e5..f51ddfdf9e 100644 --- a/src/gui/widgets/qframe.cpp +++ b/src/gui/widgets/qframe.cpp @@ -244,7 +244,7 @@ QFrame::~QFrame() /*! Returns the frame style. - The default value is QFrame::NoFrame. + The default value is QFrame::Plain. \sa setFrameStyle(), frameShape(), frameShadow() */ |