diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-06 15:35:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-06 19:00:41 +0200 |
| commit | 2a302a73613d68475e667f69b8e36ce07853c813 (patch) | |
| tree | 06de55baaed993b51af517dba8f230fab749882c /src/gui/image | |
| parent | 5505d25be972948db1621e1511b89b4144aa8bfc (diff) | |
| parent | dea7110b29c5c68a5b09454c968324042ed1b607 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: Iac12a37fa6536ebe30e6548f7c54ec0c402c9f5d
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qicon.cpp | 2 | ||||
| -rw-r--r-- | src/gui/image/qpicture.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 2b47fb536b..1d1b6d3c49 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -1523,7 +1523,7 @@ QDebug operator<<(QDebug dbg, const QIcon &i) foo@3x.png, then foo@2x, then fall back to foo.png if not found. \a sourceDevicePixelRatio will be set to the value of N if the argument is - a non-null pointer + not \nullptr */ QString qt_findAtNxFile(const QString &baseFileName, qreal targetDevicePixelRatio, qreal *sourceDevicePixelRatio) diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 350fda19ac..fe1e4d2c9b 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1486,8 +1486,8 @@ static QPictureHandler *get_picture_handler(const char *format) \a format is used to select a handler to write a QPicture; \a header is used to select a handler to read an picture file. - If \a readPicture is a null pointer, the QPictureIO will not be able - to read pictures in \a format. If \a writePicture is a null pointer, + If \a readPicture is \nullptr, the QPictureIO will not be able + to read pictures in \a format. If \a writePicture is \nullptr, the QPictureIO will not be able to write pictures in \a format. If both are null, the QPictureIO object is valid but useless. |