projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
57ac1d9
)
ProtocolWidget: Fix adding of seconds. #2535
author
Christian Kamm
<kamm@incasoftware.de>
Fri, 10 Apr 2015 10:11:35 +0000
(12:11 +0200)
committer
Christian Kamm
<kamm@incasoftware.de>
Fri, 10 Apr 2015 10:11:35 +0000
(12:11 +0200)
src/gui/protocolwidget.cpp
patch
|
blob
|
history
diff --git
a/src/gui/protocolwidget.cpp
b/src/gui/protocolwidget.cpp
index d4b6c2bfaae161a2a573b37225ab3e61b5653287..85e3f410200a7e62e820c7d7ff0289c4eff15a04 100644
(file)
--- a/
src/gui/protocolwidget.cpp
+++ b/
src/gui/protocolwidget.cpp
@@
-169,8
+169,8
@@
QString ProtocolWidget::timeString(QDateTime dt, QLocale::FormatType format) con
{
const QLocale loc = QLocale::system();
QString dtFormat = loc.dateTimeFormat(format);
- static const QRegExp re("
HH:mm(?!:s
s)");
- dtFormat.replace(re, "
HH
:mm:ss");
+ static const QRegExp re("
(HH|H|hh|h):mm(?!:
s)");
+ dtFormat.replace(re, "
\\1
:mm:ss");
return loc.toString(dt, dtFormat);
}