diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-24 23:54:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-24 23:54:54 (GMT) |
| commit | 9bd3e7677fff694068052295449a6869e2faf722 (patch) | |
| tree | b26f675a8a0e5667a63183955d25f3fccffea141 /src/gui/dialogs | |
| parent | a50402893bd2d8bda37fc3ef2da3d8326445010a (diff) | |
| parent | e475d3e7fc023109478726555b676203cf8c4c5c (diff) | |
| download | Qt-9bd3e7677fff694068052295449a6869e2faf722.zip Qt-9bd3e7677fff694068052295449a6869e2faf722.tar.gz Qt-9bd3e7677fff694068052295449a6869e2faf722.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevented infinite loop in QMoviePrivate::next().
Added int overloads to QPoint operator* and operator*=.
tst_qmessagebox: add debug to know why it fails
QMessageBox wrong Show/Hide Details button label
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 224a176..af9616d 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1925,7 +1925,7 @@ void QMessageBoxPrivate::retranslateStrings() { #ifndef QT_NO_TEXTEDIT if (detailsButton) - detailsButton->setLabel(detailsText->isHidden() ? HideLabel : ShowLabel); + detailsButton->setLabel(detailsText->isHidden() ? ShowLabel : HideLabel); #endif } |