Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I320a0ae55f27db5a8bcb50c2574c3f92fbf35e63

4 files changed, 8 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)
diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
index 19fd1240..6eca4d9c 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
@@ -361,7 +361,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 b495050d..9cbb45ce 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp
@@ -241,7 +241,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)
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp
index 8c872b43..7d713cce 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp
@@ -195,12 +195,14 @@ bool QDeclarativeViewInspector::leaveEvent(QEvent *event)
 
 bool QDeclarativeViewInspector::mouseMoveEvent(QMouseEvent *event)
 {
+#ifndef QT_NO_TOOLTIP
     QList<QGraphicsItem*> selItems = data->selectableItems(event->pos());
     if (!selItems.isEmpty()) {
         declarativeView()->setToolTip(currentTool()->titleForItem(selItems.first()));
     } else {
         declarativeView()->setToolTip(QString());
     }
+#endif // QT_NO_TOOLTIP
 
     return AbstractViewInspector::mouseMoveEvent(event);
 }