diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:50:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-25 12:50:29 +0200 |
| commit | 9e04c60ac070348f8208fb0254e62d6e593320c3 (patch) | |
| tree | cd038cf2612faf8dadeae5fb8b807b66e2291026 /src/widgets/platforms/mac/qeventdispatcher_mac_p.h | |
| parent | bfa8d15e15fdeb0bbfb6575e37be1c32445ab7cc (diff) | |
| parent | 04d0a9626ce61b2e05a40f9562c2bcf12e234639 (diff) | |
Merge "Merge branch 'master' into refactor" into refactor
Diffstat (limited to 'src/widgets/platforms/mac/qeventdispatcher_mac_p.h')
| -rw-r--r-- | src/widgets/platforms/mac/qeventdispatcher_mac_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/platforms/mac/qeventdispatcher_mac_p.h b/src/widgets/platforms/mac/qeventdispatcher_mac_p.h index 485b14c38f..f4cf16e8a0 100644 --- a/src/widgets/platforms/mac/qeventdispatcher_mac_p.h +++ b/src/widgets/platforms/mac/qeventdispatcher_mac_p.h @@ -141,7 +141,7 @@ struct MacTimerInfo { QObject *obj; bool pending; CFRunLoopTimerRef runLoopTimer; - bool operator==(const MacTimerInfo &other) + bool operator==(const MacTimerInfo &other) const { return (id == other.id); } |