diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-06 01:00:35 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-04-06 15:45:11 +0200 |
| commit | 864048a8f5625b252bb2ac63812fd3edb7361343 (patch) | |
| tree | 5c9339c80f7a1a6d0725031626fa5fcf1e2fbd19 /src/corelib/tools | |
| parent | 1c23d34ad4bdd67dec6d501d91087823dc9ea358 (diff) | |
| parent | 4ee7adf59d13ada5bfaa4f0382e0bb70b66b8814 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/kernel/qeventdispatcher_win.cpp
Change-Id: I32db3f755577aefc15f757041367d6144f5e5c66
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp index dde66ed093..3afd23d76b 100644 --- a/src/corelib/tools/qline.cpp +++ b/src/corelib/tools/qline.cpp @@ -374,7 +374,7 @@ QDataStream &operator>>(QDataStream &stream, QLine &line) */ /*! - \enum QLineF::IntersectType + \enum QLineF::IntersectionType Describes the intersection between two lines. |