diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 14:51:40 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:24:39 +0200 |
commit | 13374ceb165c44658aa97890c37b206859c9a31c (patch) | |
tree | 562362b196a459ee3449a5a1e60e5216a9dd6984 /src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp | |
parent | ae47deba4c943c496412530a8d2a5a688ae12038 (diff) | |
parent | b5d18be5a03406d0aac83856dd41e1525fd14a28 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I2963c1209316fb6755f572969f368970450d7991
Diffstat (limited to 'src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp')
-rw-r--r-- | src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp index 70378d2950..683ccb60c2 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer.cpp @@ -45,7 +45,8 @@ QT_BEGIN_NAMESPACE QSGSoftwareLayer::QSGSoftwareLayer(QSGRenderContext *renderContext) - : m_item(nullptr) + : QSGLayer(*(new QSGSoftwareLayerPrivate)) + , m_item(nullptr) , m_context(renderContext) , m_renderer(nullptr) , m_device_pixel_ratio(1) @@ -69,6 +70,11 @@ int QSGSoftwareLayer::textureId() const return 0; } +int QSGSoftwareLayerPrivate::comparisonKey() const +{ + return 0; +} + QSize QSGSoftwareLayer::textureSize() const { return m_pixmap.size(); |