diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-14 06:19:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-14 06:19:34 (GMT) |
| commit | b01c2c90bf58a96afadc6fc5547203a6a37893c5 (patch) | |
| tree | 96125e444f32691c73bc87f0bc938993b7737899 /src/gui/widgets/qdialogbuttonbox.cpp | |
| parent | 2e7a64a60be75f9f814cb5eb6839edde20b4baf2 (diff) | |
| parent | 01057867c3e5e97fc8b58601e3cee6dfef0df205 (diff) | |
| download | Qt-b01c2c90bf58a96afadc6fc5547203a6a37893c5.zip Qt-b01c2c90bf58a96afadc6fc5547203a6a37893c5.tar.gz Qt-b01c2c90bf58a96afadc6fc5547203a6a37893c5.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (69 commits)
runonphone timestamps nanosecond formating set to 9 chars, 0 padded
Add -nn for .cpp MOC preprocessing for INTEGRITY
Remove commented out code.
Update Polish translations for 4.8
Fixes: libpng symbols exported from QtGui.dll on Windows
omit unassigned (and too recent codepoints) from the text Normalization process
purge "Translation Rules for Plurals"
add -list-languages option to lupdate
Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
Ukrainian translation updated
QHostInfo: fix a race condition under CE
Do not let QGLContext get out of sync when doing mixed VG-GL rendering
Build fix for WINCE to qfilesystemengine_win.cpp
Fixed typo in QSettings documentation.
Doc updates to "Installing Qt for the Symbian Platform" page.
Create auto test for http HEAD request
QNAM - fix poor performance of HEAD request with authentication
Added Qt Quick Components link to document
remove dead code
Added text about -random and -seed options in QTest to changelog
...
Diffstat (limited to 'src/gui/widgets/qdialogbuttonbox.cpp')
| -rw-r--r-- | src/gui/widgets/qdialogbuttonbox.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp index 6c29141..e6842b3 100644 --- a/src/gui/widgets/qdialogbuttonbox.cpp +++ b/src/gui/widgets/qdialogbuttonbox.cpp @@ -94,6 +94,7 @@ QT_BEGIN_NAMESPACE specifying their role. \snippet examples/dialogs/extension/finddialog.cpp 1 + \snippet examples/dialogs/extension/finddialog.cpp 6 Alternatively, QDialogButtonBox provides several standard buttons (e.g. OK, Cancel, Save) that you can use. They exist as flags so you can OR them together in the constructor. |