summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-12-23 09:36:45 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-12-23 09:39:05 -0800
commitaff1bac497f1e84c3a173c7a227a1735a28f943a (patch)
tree6db55e7c59ec9999df06b66ce839068ae5f57359
parent9c3c2b09a713495586fa5d8077509ef179f6d686 (diff)
downloadsubsurface-aff1bac497f1e84c3a173c7a227a1735a28f943a.tar.gz
Enable tag bubble eye candy for Qt5 and Mac
This works when building against Qt5, so no reason to hide the cute bubbles from our Mac users anymore. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/groupedlineedit.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/qt-ui/groupedlineedit.cpp b/qt-ui/groupedlineedit.cpp
index d08e4ab0c..be93f24d6 100644
--- a/qt-ui/groupedlineedit.cpp
+++ b/qt-ui/groupedlineedit.cpp
@@ -169,12 +169,10 @@ void GroupedLineEdit::keyPressEvent(QKeyEvent *e)
void GroupedLineEdit::paintEvent(QPaintEvent *e)
{
-#if !defined __APPLE__
- // for reasons we don't understand, yet, touching the painter
+#if QT_VERSION >= 0x050000 || !defined __APPLE__
+ // for reasons we don't understand, touching the painter
// here (even drawing the fill rect) causes the QPlainTextEdit
- // paintEvent to not draw the text on MacOS.
- // So as a workaround until this is better understood we need
- // to disable the eye candy
+ // paintEvent to not draw the text on Qt4 & MacOS.
QTextLine line = document()->findBlock(0).layout()->lineAt(0);
QPainter painter(viewport());