diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-23 03:02:27 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-23 03:02:34 +0200 |
| commit | 7e60b6d599db9d4b18db3fe050d9f53ccb3125c1 (patch) | |
| tree | 08d8c9a79f7d7b1d8f94ad0dc3244a4b87166295 /src/render/renderstates/renderstatenode_p.h | |
| parent | bd09583403b27dedb3d6a7c7c737b0c1a49432e1 (diff) | |
| parent | e8563dbbb56194d48256af984813a98c56e0bb79 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/render/renderstates/renderstatenode_p.h')
| -rw-r--r-- | src/render/renderstates/renderstatenode_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/renderstates/renderstatenode_p.h b/src/render/renderstates/renderstatenode_p.h index 886bb0c95..277b8a7c8 100644 --- a/src/render/renderstates/renderstatenode_p.h +++ b/src/render/renderstates/renderstatenode_p.h @@ -65,7 +65,7 @@ public: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override; - StateMaskSet mask() const { return m_impl.type; } + StateMask type() const { return m_impl.type; } StateVariant impl() const { return m_impl; } protected: |