diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-08 01:00:31 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-08 01:00:31 +0200 |
| commit | 38e97c68ba25c29a6fbdd3f79d56fd52a0f58a4c (patch) | |
| tree | 10bba7efed661c45e62c89c07f8b0f01d9bf6701 /src/quick/scenegraph/qsgrhitextureglyphcache_p.h | |
| parent | 67fc5b677a05f88f043ea825810b7b244a516b42 (diff) | |
| parent | e5f3e7149b7e130c375c1419f1f804dfeaf578aa (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib381f350ada365747ce20b989bfdc368d75f2219
Diffstat (limited to 'src/quick/scenegraph/qsgrhitextureglyphcache_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgrhitextureglyphcache_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgrhitextureglyphcache_p.h b/src/quick/scenegraph/qsgrhitextureglyphcache_p.h index 75d82de90d..a7374d91a4 100644 --- a/src/quick/scenegraph/qsgrhitextureglyphcache_p.h +++ b/src/quick/scenegraph/qsgrhitextureglyphcache_p.h @@ -90,7 +90,7 @@ private: QRhiTexture *m_texture = nullptr; QSize m_size; bool m_bgra = false; - QVector<QRhiTextureUploadEntry> m_uploads; + QVarLengthArray<QRhiTextureUploadEntry, 16> m_uploads; QSet<QRhiTexture *> m_pendingDispose; }; |