diff options
| author | Jiewen Wang <jiewen.wang@logicpd.com> | 2012-05-31 12:00:25 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-31 21:45:21 (GMT) |
| commit | 4ec0baf312ec2b26b1dfbee34a22b2ef7dfeccf1 (patch) | |
| tree | 47d003af88c48c20b6764bfb2c62760422cd4eff /src/gui/widgets/qstatusbar.cpp | |
| parent | 79a3efbd95f6df17dc1f922b469c67d86183c233 (diff) | |
| download | Qt-4ec0baf312ec2b26b1dfbee34a22b2ef7dfeccf1.zip Qt-4ec0baf312ec2b26b1dfbee34a22b2ef7dfeccf1.tar.gz Qt-4ec0baf312ec2b26b1dfbee34a22b2ef7dfeccf1.tar.bz2 | |
QStatusBar::showMessage will always take new timeout
There is a message check in QStatusBar::showMessage causing the call exits
early if the new 'message' is the same as the current message. The check
has been removed, and new timeout will always take effect. Unit test is
added as well.
Change-Id: Id3d6ed15104d4d40c1cd2c76444c30badc8b1b72
Task-Id: QTBUG-25492
Backport of <7381328bcc37283be97eedddc24c46be1e38490e> from Qt5
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/gui/widgets/qstatusbar.cpp')
| -rw-r--r-- | src/gui/widgets/qstatusbar.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/widgets/qstatusbar.cpp b/src/gui/widgets/qstatusbar.cpp index 7b668a6..38ceb6a 100644 --- a/src/gui/widgets/qstatusbar.cpp +++ b/src/gui/widgets/qstatusbar.cpp @@ -595,8 +595,6 @@ void QStatusBar::reformat() void QStatusBar::showMessage(const QString &message, int timeout) { Q_D(QStatusBar); - if (d->tempItem == message) - return; d->tempItem = message; |