summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-21 21:49:00 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-21 21:49:00 (GMT)
commit5e5a637cca3709a64f7dfa4e668a8c9d985e9579 (patch)
tree6e9bc6758acc0ad1ecfdf0c145fdf9df0b9923c6 /src
parentd37a3529ec883985b2967265f0797d749db74308 (diff)
parent482e924154a57cf2e37d8224d3c677635aa56317 (diff)
downloadQt-5e5a637cca3709a64f7dfa4e668a8c9d985e9579.zip
Qt-5e5a637cca3709a64f7dfa4e668a8c9d985e9579.tar.gz
Qt-5e5a637cca3709a64f7dfa4e668a8c9d985e9579.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: QMessageBox wrong Show/Hide Details button label
Diffstat (limited to 'src')
-rw-r--r--src/gui/dialogs/qmessagebox.cpp2
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
}