diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:43 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-01-09 07:24:26 +0000 |
| commit | ba10b0b9ed93be007fcb156710ef6081000e3ae3 (patch) | |
| tree | ea17c625900b83d5955cb4a2db1587a5f07e2fb4 /src/quick | |
| parent | 653c25d48298fb747cf6f3b012816855c51d4260 (diff) | |
| parent | 1798d20ded699837f7b3afe0bb340617af266518 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/particles/qquickitemparticle.cpp
src/qmlmodels/qqmladaptormodel.cpp
tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
Change-Id: Ibd8fbb91da6893a09f4ffe61ad0b95d8149bbc87
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/configure.json | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgrhitextureglyphcache.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/configure.json b/src/quick/configure.json index 0cb1e7470b..f8277332dc 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -3,9 +3,11 @@ "depends": [ "core-private", "qml-private", + "gui", "gui-private", "qmlmodels-private" ], + "condition": "module.gui", "testDir": "../../config.tests", "commandline": { diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index bc0d04c763..baef37a0ff 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -533,7 +533,7 @@ public: void refWindow(QQuickWindow *); void derefWindow(); - QQuickItem *subFocusItem; + QPointer<QQuickItem> subFocusItem; void updateSubFocusItem(QQuickItem *scope, bool focus); QTransform windowToItemTransform() const; diff --git a/src/quick/scenegraph/qsgrhitextureglyphcache.cpp b/src/quick/scenegraph/qsgrhitextureglyphcache.cpp index d0108bc56e..89c9ea4d5b 100644 --- a/src/quick/scenegraph/qsgrhitextureglyphcache.cpp +++ b/src/quick/scenegraph/qsgrhitextureglyphcache.cpp @@ -145,7 +145,9 @@ void QSGRhiTextureGlyphCache::prepareGlyphImage(QImage *img) { const int maskWidth = img->width(); const int maskHeight = img->height(); +#if Q_BYTE_ORDER != Q_BIG_ENDIAN const bool supportsBgra = m_rhi->isTextureFormatSupported(QRhiTexture::BGRA8); +#endif m_bgra = false; if (img->format() == QImage::Format_Mono) { |