diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-29 08:09:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-29 08:10:45 +0100 |
| commit | 2609429d7afc263ab8e44864b0f42f1c8356eda8 (patch) | |
| tree | 78798b4006a7c6664bf41b44011a57110ee94acd /src/quick/scenegraph/qsgbasicinternalimagenode.cpp | |
| parent | 475c74a9926efcd968572563e678988e53804603 (diff) | |
| parent | 4a886753a75c7c4d66f1fa9cab5a6c5a03240df3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/imports/settings/qqmlsettings.cpp
src/quick/items/qquickwindow.cpp
tools/qmlplugindump/main.cpp
Change-Id: I96fedbc773a110374baed79a0b7de92d65df0ed6
Diffstat (limited to 'src/quick/scenegraph/qsgbasicinternalimagenode.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgbasicinternalimagenode.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgbasicinternalimagenode.cpp b/src/quick/scenegraph/qsgbasicinternalimagenode.cpp index 53271af9ab..03b48b4b8a 100644 --- a/src/quick/scenegraph/qsgbasicinternalimagenode.cpp +++ b/src/quick/scenegraph/qsgbasicinternalimagenode.cpp @@ -230,6 +230,9 @@ QSGGeometry *QSGBasicInternalImageNode::updateGeometry(const QRectF &targetRect, ++vCells; if (innerTargetRect.bottom() != targetRect.bottom()) ++vCells; + if (hCells * vCells * 4 >= 0x10000) + qWarning("QTBUG-58924 - Too many tiles in QSGInternalImageNode, rendering will be partially missing."); + QVarLengthArray<X, 32> xData(2 * hCells); QVarLengthArray<Y, 32> yData(2 * vCells); X *xs = xData.data(); |