diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 09:25:42 +0200 |
| commit | 5909e6d0d10de3e1370b3ea0bc596f580101e3b4 (patch) | |
| tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/WebCore/platform/Cursor.h | |
| parent | beaeeb99881184fd368c121fcbb1a31c78b794a3 (diff) | |
| parent | 81cbb264cb9446c4408124d50aeff50164ad0ab4 (diff) | |
| download | qtwebkit-5909e6d0d10de3e1370b3ea0bc596f580101e3b4.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.212' into dev"
Diffstat (limited to 'Source/WebCore/platform/Cursor.h')
| -rw-r--r-- | Source/WebCore/platform/Cursor.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/WebCore/platform/Cursor.h b/Source/WebCore/platform/Cursor.h index d06ad7d47..a81783e5f 100644 --- a/Source/WebCore/platform/Cursor.h +++ b/Source/WebCore/platform/Cursor.h @@ -42,6 +42,7 @@ typedef HICON HCURSOR; #include "GRefPtrGtk.h" #elif PLATFORM(QT) #include <QCursor> +#include <wtf/Optional.h> #endif #if USE(APPKIT) @@ -140,7 +141,9 @@ namespace WebCore { #if ENABLE(MOUSE_CURSOR_SCALE) , m_imageScaleFactor(1) #endif - , m_platformCursor(0) +#if !PLATFORM(QT) + , m_platformCursor(nullptr) +#endif #endif // !PLATFORM(IOS) { } @@ -181,7 +184,9 @@ namespace WebCore { float m_imageScaleFactor; #endif -#if !USE(APPKIT) +#if PLATFORM(QT) + mutable Optional<QCursor> m_platformCursor; +#elif !USE(APPKIT) mutable PlatformCursor m_platformCursor; #else mutable RetainPtr<NSCursor> m_platformCursor; |