From 9c6a2bf5ac8263ce33a1f72bf2525669c98c12fc Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 10 Aug 2011 16:54:59 +0200 Subject: QmlInspector: Fix compile for QT_NO_CURSOR Change-Id: I0686ba006e6ab42dbd08cda6d36874d1c99009fe --- src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp | 2 ++ src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp | 2 ++ src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp index 72e1380..efb5471 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp @@ -75,7 +75,9 @@ void ColorPickerTool::mouseMoveEvent(QMouseEvent *event) void ColorPickerTool::clear() { +#ifndef QT_NO_CURSOR view()->setCursor(Qt::CrossCursor); +#endif } void ColorPickerTool::pickColor(const QPoint &pos) diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp index 6085d81..3b2493a 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp @@ -363,7 +363,9 @@ void LiveSelectionTool::setSelectOnlyContentItems(bool selectOnlyContentItems) void LiveSelectionTool::clear() { +#ifndef QT_NO_CURSOR view()->setCursor(Qt::ArrowCursor); +#endif m_rubberbandSelectionManipulator.clear(), m_singleSelectionManipulator.clear(); m_selectionIndicator.clear(); diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp index c8ade82..b66bc14 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp @@ -244,7 +244,9 @@ void ZoomTool::keyReleaseEvent(QKeyEvent *event) void ZoomTool::clear() { +#ifndef QT_NO_CURSOR view()->setCursor(Qt::ArrowCursor); +#endif } void ZoomTool::scaleView(const QPointF ¢erPos) -- cgit v0.12