summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-09-15 17:57:16 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-09-17 11:59:25 +0200
commit1c88058657f18d8cf03a872d9795de54f5581ce5 (patch)
treefae19b95191968941339f8a7efb3538caaa300e9
parent42f5f2d34d02d0793a9703d5da58932209307683 (diff)
compile with QT_NO_CURSOR5.3
Change-Id: Ied2bb3467f6d76cfab57bbd27c7f4b315c036d6f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp2
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp2
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp
index a5b21e19..bd14a5ff 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp
@@ -76,7 +76,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)
diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
index 8811584d..75c81cf0 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
@@ -369,7 +369,9 @@ void LiveSelectionTool::setSelectOnlyContentItems(bool selectOnlyContentItems)
void LiveSelectionTool::clear()
{
+#ifndef QT_NO_CURSOR
view()->setCursor(Qt::ArrowCursor);
+#endif // QT_NO_CURSOR
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 da63b7b0..b981b553 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp
@@ -249,7 +249,9 @@ void ZoomTool::keyReleaseEvent(QKeyEvent *event)
void ZoomTool::clear()
{
+#ifndef QT_NO_CURSOR
view()->setCursor(Qt::ArrowCursor);
+#endif // QT_NO_CURSOR
}
void ZoomTool::scaleView(const QPointF &centerPos)