diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:13:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:13:22 +0200 |
| commit | b8c59afe7fde2fb38b9e6f9044f8770584b5f5a2 (patch) | |
| tree | 3fdd8b33c88c7bcb8c8a873e1db14470a775251a /src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp | |
| parent | 71907f5c887faf7d6cb5fa916ed5e9d485f74cf6 (diff) | |
| parent | 61df13088c6c1d6a1b5a6d329dcc6879b33d69ba (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I89edb0c7d2d7abd6ac5a14f9f5afcb60f722734a
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp index dc20ec32..a4e32bf5 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp @@ -68,7 +68,9 @@ void ColorPickerTool::mouseMoveEvent(QMouseEvent *event) void ColorPickerTool::clear() { +#ifndef QT_NO_CURSOR view()->setCursor(Qt::CrossCursor); +#endif // QT_NO_CURSOR } void ColorPickerTool::pickColor(const QPoint &pos) |