diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/widgets/kernel/qformlayout.cpp | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/widgets/kernel/qformlayout.cpp')
| -rw-r--r-- | src/widgets/kernel/qformlayout.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp index 955ef4e3c7..dd61528124 100644 --- a/src/widgets/kernel/qformlayout.cpp +++ b/src/widgets/kernel/qformlayout.cpp @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -1124,15 +1124,14 @@ QStyle* QFormLayoutPrivate::getStyle() const \value DontWrapRows Fields are always laid out next to their label. This is - the default policy for all styles except Qt Extended styles - and QS60Style. + the default policy for all styles except Qt Extended styles. \value WrapLongRows Labels are given enough horizontal space to fit the widest label, and the rest of the space is given to the fields. If the minimum size of a field pair is wider than the available space, the field is wrapped to the next line. This is the default policy for - Qt Extended styles and and QS60Style. + Qt Extended styles. \value WrapAllRows Fields are always laid out below their label. @@ -1721,7 +1720,7 @@ QFormLayout::FieldGrowthPolicy QFormLayout::fieldGrowthPolicy() const \brief the way in which the form's rows wrap The default value depends on the widget or application style. For - Qt Extended styles and QS60Style, the default is WrapLongRows; + Qt Extended styles, the default is WrapLongRows; for the other styles, the default is DontWrapRows. If you want to display each label above its associated field |