diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-28 01:00:42 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-28 01:00:42 +0100 |
| commit | 7920397f0c1d6a809b55dbd0ea3b09c327b8cbbd (patch) | |
| tree | bfe7b7a5df0047c80364b0a8fe7595110e7d523a /src/plugins/platforms/cocoa/qcocoascreen.h | |
| parent | 7ac3bc9f830a8ea1ebdf4738e883bdc01522c31f (diff) | |
| parent | dcbe25bbbb603bc335d7cf0982a80293289b0d8f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I7803400aa500363fbaa57b0661315064bd3239d9
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoascreen.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoascreen.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoascreen.h b/src/plugins/platforms/cocoa/qcocoascreen.h index 60243b79be..7ec9a2b5af 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.h +++ b/src/plugins/platforms/cocoa/qcocoascreen.h @@ -99,18 +99,18 @@ private: static void add(CGDirectDisplayID displayId); void remove(); - CGDirectDisplayID m_displayId = 0; + CGDirectDisplayID m_displayId = kCGNullDirectDisplay; QRect m_geometry; QRect m_availableGeometry; QDpi m_logicalDpi; - qreal m_refreshRate; - int m_depth; + qreal m_refreshRate = 0; + int m_depth = 0; QString m_name; QImage::Format m_format; QSizeF m_physicalSize; QCocoaCursor *m_cursor; - qreal m_devicePixelRatio; + qreal m_devicePixelRatio = 0; CVDisplayLinkRef m_displayLink = nullptr; dispatch_source_t m_displayLinkSource = nullptr; |