diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-28 12:18:15 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-28 12:18:15 (GMT) |
| commit | 50576bd26cd5fb1316f0844ab6da76910d124edd (patch) | |
| tree | 84b6f2103a60e08a3ea8f1ba8d985b33a710792a /src/gui/dialogs | |
| parent | 27d979b0ea39922e6e2ae3a3cc6a4d45c9c8f0e9 (diff) | |
| parent | 353afc392b843519023f27753b45b2e6fd9467ff (diff) | |
| download | Qt-50576bd26cd5fb1316f0844ab6da76910d124edd.zip Qt-50576bd26cd5fb1316f0844ab6da76910d124edd.tar.gz Qt-50576bd26cd5fb1316f0844ab6da76910d124edd.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/gui/embedded/qkbdtty_qws.cpp
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qmessagebox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index ae5b4a3..6790c3d 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1720,7 +1720,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) QMessageBox *msgBox = new QMessageBox(parent); msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setWindowTitle(title.isEmpty() ? tr("About Qt") : title); - msgBox->setText(translatedTextAboutQt); + msgBox->setInformativeText(translatedTextAboutQt); QPixmap pm(QLatin1String(":/trolltech/qmessagebox/images/qtlogo-64.png")); if (!pm.isNull()) |