diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-25 09:55:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-25 09:55:25 +0100 |
| commit | 5439451defb11c29e2e1d18737cb99d0f576a961 (patch) | |
| tree | a63443ca2445eb4447282c2f31938fb993cf039b /src/gui/kernel/qevent.h | |
| parent | 4e551aeb0e202397aafc5c6d09137acee98c9404 (diff) | |
| parent | 97965a0908b8fbf7f01d0880410929a4ea61b48d (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
mkspecs/features/qt_module.prf
src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
Change-Id: I7912c23b02b186831f0e465dbe5d1f9936205439
Diffstat (limited to 'src/gui/kernel/qevent.h')
| -rw-r--r-- | src/gui/kernel/qevent.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 979e679c1e..eca5e6951d 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -801,7 +801,7 @@ public: TouchPoint(const TouchPoint &other); #ifdef Q_COMPILER_RVALUE_REFS TouchPoint(TouchPoint &&other) Q_DECL_NOEXCEPT - : d(0) + : d(Q_NULLPTR) { qSwap(d, other.d); } TouchPoint &operator=(TouchPoint &&other) Q_DECL_NOEXCEPT { qSwap(d, other.d); return *this; } |