Commit 0a991262 authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Icf394b5629963d28fd314325ce2710334f22462d
parents 0e11d7a3 f878323a
No related merge requests found
Showing with 30 additions and 4 deletions
Qt 5.10.1 is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 5.10.0.
For more details, refer to the online documentation included in this
distribution. The documentation is also available online:
http://doc.qt.io/qt-5/index.html
The Qt version 5.10 series is binary compatible with the 5.9.x series.
Applications compiled for 5.9 will continue to run with 5.10.
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Qt Bug Tracker:
https://bugreports.qt.io/
Each of these identifiers can be entered in the bug tracker to obtain more
information about a particular change.
This release contains all fixes included in the Qt 5.9.4 release.
****************************************************************************
* Qt 5.10.1 Changes *
****************************************************************************
- This release contains only minor code improvements.
...@@ -667,13 +667,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) ...@@ -667,13 +667,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", fprintf(fd, " %3lu: [%8I64u, %8I64u]\n",
(unsigned long) s, (unsigned long) s,
(unsigned __int64) td->td_stripoffset[s], td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0,
(unsigned __int64) td->td_stripbytecount[s]); td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0);
#else #else
fprintf(fd, " %3lu: [%8llu, %8llu]\n", fprintf(fd, " %3lu: [%8llu, %8llu]\n",
(unsigned long) s, (unsigned long) s,
(unsigned long long) td->td_stripoffset[s], td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0,
(unsigned long long) td->td_stripbytecount[s]); td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0);
#endif #endif
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment