Merge remote-tracking branch 'origin/KDE/4.12'

Conflicts: src/main.cpp
12 years ago · c5e6ebed08
parent b79701cefd be6bf3a1d4
commit c5e6ebed08
1 changed files with 1 additions and 1 deletions
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@ -1987,7 +1987,7 @@ void TerminalDisplay::mouseMoveEvent(QMouseEvent* ev)
            update(_mouseOverHotspotArea | previousHotspotArea);
        }
    } else if (!_mouseOverHotspotArea.isEmpty()) {
-        if (_underlineLinks && (_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier)))
+        if ((_underlineLinks && (_openLinksByDirectClick || (ev->modifiers() & Qt::ControlModifier))) || (cursor().shape() == Qt::PointingHandCursor))
            setCursor(_mouseMarks ? Qt::IBeamCursor : Qt::ArrowCursor);

        update(_mouseOverHotspotArea);