From aff1bac497f1e84c3a173c7a227a1735a28f943a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 23 Dec 2014 09:36:45 -0800 Subject: 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 --- qt-ui/groupedlineedit.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'qt-ui') 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()); -- cgit v1.2.3-70-g09d2