diff options
author | David Boddie <dboddie@trolltech.com> | 2009-11-25 15:24:01 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2009-11-25 15:24:01 (GMT) |
commit | 143fbe251f626bc74e4f90fee55deddecb50d627 (patch) | |
tree | 3e22a991954dc7c291c5c58adb7b76648b439a8c /examples | |
parent | e58b0e2e562f1c5284ced8671d85df748a4a9639 (diff) | |
parent | 7b845236d8670bb9cb5884ea60f422d09dafd89c (diff) | |
download | Qt-143fbe251f626bc74e4f90fee55deddecb50d627.zip Qt-143fbe251f626bc74e4f90fee55deddecb50d627.tar.gz Qt-143fbe251f626bc74e4f90fee55deddecb50d627.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'examples')
-rw-r--r-- | examples/dialogs/standarddialogs/dialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/dialogs/standarddialogs/dialog.cpp b/examples/dialogs/standarddialogs/dialog.cpp index 6e06190..270fdd0 100644 --- a/examples/dialogs/standarddialogs/dialog.cpp +++ b/examples/dialogs/standarddialogs/dialog.cpp @@ -124,7 +124,7 @@ Dialog::Dialog(QWidget *parent) errorLabel = new QLabel; errorLabel->setFrameStyle(frameStyle); QPushButton *errorButton = - new QPushButton(tr("QErrorMessage::show&M&essage()")); + new QPushButton(tr("QErrorMessage::showM&essage()")); connect(integerButton, SIGNAL(clicked()), this, SLOT(setInteger())); connect(doubleButton, SIGNAL(clicked()), this, SLOT(setDouble())); |