diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-02-25 14:19:34 +0100 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-02 13:58:43 +0000 |
| commit | f28088873e955f599e585c7dc732ffc93bebe782 (patch) | |
| tree | ec97fc66d919bae7bf8589f6f23c1844535b53cb /src/widgets | |
| parent | 9d80deb92f066dba6c2bfce98f5cc83304026c2b (diff) | |
| parent | e718818745e6db8df09ea55c4071e116f00851c9 (diff) | |
Merge "QLabel: simplify createStandardContextMenu"
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qlabel.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 2d7b7f79b1..189a7488d3 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -1694,14 +1694,13 @@ QPoint QLabelPrivate::layoutPoint(const QPoint& p) const #ifndef QT_NO_CONTEXTMENU QMenu *QLabelPrivate::createStandardContextMenu(const QPoint &pos) { - QString linkToCopy; - QPoint p; - if (control && effectiveTextFormat != Qt::PlainText) { - p = layoutPoint(pos); - linkToCopy = control->document()->documentLayout()->anchorAt(p); - } + if (!control || effectiveTextFormat == Qt::PlainText) + return nullptr; + + const QPoint p = layoutPoint(pos); + QString linkToCopy = control->document()->documentLayout()->anchorAt(p); - if (linkToCopy.isEmpty() && !control) + if (linkToCopy.isEmpty()) return nullptr; return control->createStandardContextMenu(p, q_func()); |