projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement /ignore functionality
[quassel.git]
/
src
/
uisupport
/
multilineedit.cpp
diff --git
a/src/uisupport/multilineedit.cpp
b/src/uisupport/multilineedit.cpp
index
90eadaa
..
31335d1
100644
(file)
--- a/
src/uisupport/multilineedit.cpp
+++ b/
src/uisupport/multilineedit.cpp
@@
-90,6
+90,14
@@
MultiLineEdit::~MultiLineEdit()
{
}
{
}
+#if defined HAVE_KF5 || defined HAVE_KDE4
+void MultiLineEdit::createHighlighter()
+{
+ KTextEdit::createHighlighter();
+ if (highlighter())
+ highlighter()->setAutomatic(false);
+}
+#endif
void MultiLineEdit::setCustomFont(const QFont &font)
{
void MultiLineEdit::setCustomFont(const QFont &font)
{
@@
-177,7
+185,11
@@
void MultiLineEdit::updateSizeHint()
// use the style to determine a decent size
int h = qMin(qMax((int)document()->size().height() + scrollBarHeight, minPixelHeight), maxPixelHeight) + 2 * frameWidth();
// use the style to determine a decent size
int h = qMin(qMax((int)document()->size().height() + scrollBarHeight, minPixelHeight), maxPixelHeight) + 2 * frameWidth();
+#if QT_VERSION < 0x050000
QStyleOptionFrameV2 opt;
QStyleOptionFrameV2 opt;
+#else
+ QStyleOptionFrame opt;
+#endif
opt.initFrom(this);
opt.rect = QRect(0, 0, 100, h);
opt.lineWidth = lineWidth();
opt.initFrom(this);
opt.rect = QRect(0, 0, 100, h);
opt.lineWidth = lineWidth();