diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-06 01:00:08 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-06 07:20:18 +0000 |
| commit | 3a010f72b81d530df96bfb04e0dd2f13a527cc18 (patch) | |
| tree | 76bcc3439bf0efccc6b354f648817bcf455409f0 /src/network/kernel | |
| parent | 1f87fb359fdff14e42662384a9c8a0bcb3837671 (diff) | |
| parent | 2c3eaa7b87219d24facfe81a5b22cb218324f1ae (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/kernel/qvariant.h
Change-Id: I8f3873e74b9795ac889e7c7ec5de2619bca92160
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 31671feece..6476ff7741 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -595,7 +595,7 @@ QHostInfo::QHostInfo(const QHostInfo &other) } /*! - \fn QHostInfo(QHostInfo &&other) + \fn QHostInfo::QHostInfo(QHostInfo &&other) Move-constructs a new QHostInfo from \a other. |