projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge rather than replace identical sections in QSS
[quassel.git]
/
src
/
uisupport
/
qssparser.cpp
diff --git
a/src/uisupport/qssparser.cpp
b/src/uisupport/qssparser.cpp
index
8e917b7
..
c6b69d9
100644
(file)
--- a/
src/uisupport/qssparser.cpp
+++ b/
src/uisupport/qssparser.cpp
@@
-127,7
+127,7
@@
void QssParser::parseChatLineData(const QString &decl, const QString &contents)
}
}
- _formats[fmtType]
= format
;
+ _formats[fmtType]
.merge(format)
;
}
quint64 QssParser::parseFormatType(const QString &decl) {