summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-20 22:34:43 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-20 22:36:19 +0100
commit65a97fccc67ae7f3df1900e1419955f939a49b9f (patch)
treea8fd0e119b585123e77e3b2574f2d82a5474eb28 /src/gui
parent5e8bc07cb2ded1f5f74435411de666f419869514 (diff)
parent1303327a713d8f88fd9782e4f887b646d4210f68 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/image/qimage.cpp20
-rw-r--r--src/gui/painting/painting.pri2
-rw-r--r--src/gui/painting/qbackingstore.cpp3
3 files changed, 13 insertions, 12 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index a5a5f7c1a4..7fcae12cbd 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -931,7 +931,8 @@ QImage::QImage(const uchar *data, int width, int height, int bytesPerLine, Forma
The loader attempts to read the image using the specified \a
format. If the \a format is not specified (which is the default),
- the loader probes the file for a header to guess the file format.
+ it is auto-detected based on the file's suffix and header. For
+ details, see {QImageReader::setAutoDetectImageFormat()}{QImageReader}.
If the loading of the image failed, this object is a null image.
@@ -3441,8 +3442,9 @@ void QImage::rgbSwapped_inplace()
and returns \c false.
The loader attempts to read the image using the specified \a format, e.g.,
- PNG or JPG. If \a format is not specified (which is the default), the
- loader probes the file for a header to guess the file format.
+ PNG or JPG. If \a format is not specified (which is the default), it is
+ auto-detected based on the file's suffix and header. For details, see
+ {QImageReader::setAutoDetectImageFormat()}{QImageReader}.
The file name can either refer to an actual file on disk or to one
of the application's embedded resources. See the
@@ -3509,14 +3511,10 @@ bool QImage::loadFromData(const uchar *data, int len, const char *format)
Constructs a QImage from the first \a size bytes of the given
binary \a data. The loader attempts to read the image using the
specified \a format. If \a format is not specified (which is the default),
- the loader probes the file for a header to guess the file format.
- binary \a data. The loader attempts to read the image, either using the
- optional image \a format specified or by determining the image format from
- the data.
-
- If \a format is not specified (which is the default), the loader probes the
- file for a header to determine the file format. If \a format is specified,
- it must be one of the values returned by QImageReader::supportedImageFormats().
+ the loader probes the data for a header to guess the file format.
+
+ If \a format is specified, it must be one of the values returned by
+ QImageReader::supportedImageFormats().
If the loading of the image fails, the image returned will be a null image.
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 9ff0b5f5e5..1e14498f79 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -128,7 +128,7 @@ NEON_SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp
NEON_HEADERS += painting/qdrawhelper_neon_p.h
NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S
!uikit:contains(QT_ARCH, "arm"): CONFIG += no_clang_integrated_as
-!uikit:!contains(QT_ARCH, "arm64"): DEFINES += ENABLE_PIXMAN_DRAWHELPERS
+!uikit:!win32:!contains(QT_ARCH, "arm64"): DEFINES += ENABLE_PIXMAN_DRAWHELPERS
MIPS_DSP_SOURCES += painting/qdrawhelper_mips_dsp.cpp
MIPS_DSP_HEADERS += painting/qdrawhelper_mips_dsp_p.h painting/qt_mips_asm_dsp_p.h
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index d2c0912878..8d71d1c3a9 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -186,6 +186,9 @@ QPaintDevice *QBackingStore::paintDevice()
*/
void QBackingStore::endPaint()
{
+ if (paintDevice()->paintingActive())
+ qWarning() << "QBackingStore::endPaint() called with active painter on backingstore paint device";
+
d_ptr->platformBackingStore->endPaint();
}