diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:05:04 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:05:04 +0200 |
| commit | 61df13088c6c1d6a1b5a6d329dcc6879b33d69ba (patch) | |
| tree | 9be0d39601140eceb1b208e58f9b2505d768a799 /src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp | |
| parent | af503cb8014c5b0fb2928ac1596a042d979a94a3 (diff) | |
| parent | 1c88058657f18d8cf03a872d9795de54f5581ce5 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I320a0ae55f27db5a8bcb50c2574c3f92fbf35e63
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) |