diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-05 12:05:24 +0300 |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-05 12:05:24 +0300 |
| commit | c20dbae2860d1ec681be50f161792c6aede08b1b (patch) | |
| tree | ad0082d3fb710ffd20d4c1745f312c1a702b5a16 /src/gui/widgets/qabstractscrollarea.cpp | |
| parent | 9c365ff16abec339c3930444dc1722a419f07dad (diff) | |
| parent | c3e903409b96fede96cb4a7b95ba308663c88879 (diff) | |
| download | qt4-tools-c20dbae2860d1ec681be50f161792c6aede08b1b.tar.gz | |
Merge remote-tracking branch 'qt-master/master'
Conflicts:
src/s60installs/bwins/QtOpenVGu.def
Diffstat (limited to 'src/gui/widgets/qabstractscrollarea.cpp')
| -rw-r--r-- | src/gui/widgets/qabstractscrollarea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qabstractscrollarea.cpp b/src/gui/widgets/qabstractscrollarea.cpp index f948af9237..dabfec0225 100644 --- a/src/gui/widgets/qabstractscrollarea.cpp +++ b/src/gui/widgets/qabstractscrollarea.cpp @@ -511,7 +511,7 @@ QAbstractScrollArea::QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget /*! Constructs a viewport. - The \a parent arguments is sent to the QWidget constructor. + The \a parent argument is sent to the QWidget constructor. */ QAbstractScrollArea::QAbstractScrollArea(QWidget *parent) :QFrame(*new QAbstractScrollAreaPrivate, parent) |