diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-05 16:35:28 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-05 16:35:28 (GMT) |
commit | 58bac5551cbeed83a99e257226bb7b40d363bab9 (patch) | |
tree | 4c4f47fc20f53a29e4d5dcfa3e59b8e7d523dee3 /src/gui/dialogs | |
parent | ebecf192abe56c405409343acc2f97eaf9124fc3 (diff) | |
parent | 60b09b8915e2095b221eb0a16a76d49e5bb10391 (diff) | |
download | Qt-58bac5551cbeed83a99e257226bb7b40d363bab9.zip Qt-58bac5551cbeed83a99e257226bb7b40d363bab9.tar.gz Qt-58bac5551cbeed83a99e257226bb7b40d363bab9.tar.bz2 |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
mkspecs/features/symbian/symbian_building.prf
src/network/access/qhttpnetworkconnectionchannel.cpp
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r-- | src/gui/dialogs/qinputdialog.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp index 778e796..9e4b9b6 100644 --- a/src/gui/dialogs/qinputdialog.cpp +++ b/src/gui/dialogs/qinputdialog.cpp @@ -561,6 +561,9 @@ void QInputDialog::setLabelText(const QString &text) } else { d->label->setText(text); } +#ifdef Q_OS_SYMBIAN + d->label->setWordWrap(true); +#endif } QString QInputDialog::labelText() const |