diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-12-18 10:14:57 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-12-18 10:15:32 +0100 |
| commit | 1776037b0443dc57d59afe0772a83b1d47aced14 (patch) | |
| tree | 56213eee7188e5f1d2e4abe290b3757603c835ef /src/render/frontend/qrendersettings.h | |
| parent | c2ea752f684290d156c500c6a7174fe3f27fa086 (diff) | |
| parent | c754eb2883394852f155e31f5366fa25a4ffad42 (diff) | |
Merge branch '5.15' into dev
Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
Diffstat (limited to 'src/render/frontend/qrendersettings.h')
| -rw-r--r-- | src/render/frontend/qrendersettings.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/render/frontend/qrendersettings.h b/src/render/frontend/qrendersettings.h index c8771a8fa..9d2baa58b 100644 --- a/src/render/frontend/qrendersettings.h +++ b/src/render/frontend/qrendersettings.h @@ -71,7 +71,6 @@ public: Q_ENUM(RenderPolicy) // LCOV_EXCL_LINE QPickingSettings* pickingSettings(); - const QPickingSettings* pickingSettings() const; QFrameGraphNode *activeFrameGraph() const; RenderPolicy renderPolicy() const; |