diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:48:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:49:18 +0100 |
| commit | dd756011da13b95fdb630a1bbb90234f1e60f415 (patch) | |
| tree | a6259b1e9b6463108796ce912e3d1752e301505f /src/corelib/kernel/qcore_foundation.mm | |
| parent | 0c50edbe84914469973a3b10e0170023ccdd66fe (diff) | |
| parent | b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
configure.json
mkspecs/win32-icc/qmake.conf
Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
Diffstat (limited to 'src/corelib/kernel/qcore_foundation.mm')
| -rw-r--r-- | src/corelib/kernel/qcore_foundation.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/qcore_foundation.mm b/src/corelib/kernel/qcore_foundation.mm index 8b6be9b08e..0e69f69a85 100644 --- a/src/corelib/kernel/qcore_foundation.mm +++ b/src/corelib/kernel/qcore_foundation.mm @@ -495,7 +495,7 @@ NSTimeZone *QTimeZone::toNSTimeZone() const Creates a CGRect from a QRect. - \sa fromCGRect() + \sa QRectF::fromCGRect() */ CGRect QRect::toCGRect() const Q_DECL_NOTHROW { @@ -517,7 +517,7 @@ CGRect QRectF::toCGRect() const Q_DECL_NOTHROW /*! \since 5.8 - Creates a QRectF from a CGRect. + Creates a QRectF from CGRect \a rect. \sa toCGRect() */ @@ -533,7 +533,7 @@ QRectF QRectF::fromCGRect(CGRect rect) Q_DECL_NOTHROW Creates a CGPoint from a QPoint. - \sa fromCGPoint() + \sa QPointF::fromCGPoint() */ CGPoint QPoint::toCGPoint() const Q_DECL_NOTHROW { @@ -555,7 +555,7 @@ CGPoint QPointF::toCGPoint() const Q_DECL_NOTHROW /*! \since 5.8 - Creates a QRectF from a CGPoint. + Creates a QRectF from CGPoint \a point. \sa toCGPoint() */ @@ -571,7 +571,7 @@ QPointF QPointF::fromCGPoint(CGPoint point) Q_DECL_NOTHROW Creates a CGSize from a QSize. - \sa fromCGSize() + \sa QSizeF::fromCGSize() */ CGSize QSize::toCGSize() const Q_DECL_NOTHROW { @@ -593,7 +593,7 @@ CGSize QSizeF::toCGSize() const Q_DECL_NOTHROW /*! \since 5.8 - Creates a QRectF from a CGSize. + Creates a QRectF from \a size. \sa toCGSize() */ |