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/items/qquickopenglshadereffect.cpp | |
parent | 67fc5b677a05f88f043ea825810b7b244a516b42 (diff) | |
parent | e5f3e7149b7e130c375c1419f1f804dfeaf578aa (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib381f350ada365747ce20b989bfdc368d75f2219
Diffstat (limited to 'src/quick/items/qquickopenglshadereffect.cpp')
-rw-r--r-- | src/quick/items/qquickopenglshadereffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickopenglshadereffect.cpp b/src/quick/items/qquickopenglshadereffect.cpp index 0fd7df8938..e217fdb5d0 100644 --- a/src/quick/items/qquickopenglshadereffect.cpp +++ b/src/quick/items/qquickopenglshadereffect.cpp @@ -189,8 +189,8 @@ class MappedSlotObject: public QtPrivate::QSlotObjectBase public: typedef std::function<void()> PropChangedFunc; - explicit MappedSlotObject(PropChangedFunc func) - : QSlotObjectBase(&impl), _signalIndex(-1), func(func) + explicit MappedSlotObject(PropChangedFunc f) + : QSlotObjectBase(&impl), _signalIndex(-1), func(std::move(f)) { ref(); } void setSignalIndex(int idx) { _signalIndex = idx; } |