QmlJsDebugger: Remove QWEAKPOINTER_ENABLE_ARROW define

Any DEFINE used in qmljsdebugger-lib.pri is also passed to the users
code.

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp b/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp
index d6ba81b..d15eca8 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp
@@ -66,7 +66,7 @@ void SelectionIndicator::clear()
         QHashIterator<QGraphicsItem*, QGraphicsPolygonItem *> iter(m_indicatorShapeHash);
         while(iter.hasNext()) {
             iter.next();
-            m_layerItem->scene()->removeItem(iter.value());
+            m_layerItem.data()->scene()->removeItem(iter.value());
             delete iter.value();
         }
     }
@@ -111,7 +111,7 @@ void SelectionIndicator::setItems(const QList<QWeakPointer<QGraphicsObject> > &i
             addBoundingRectToPolygon(item, boundingShapeInSceneSpace);
 
             QRectF boundingRect = m_view->adjustToScreenBoundaries(boundingShapeInSceneSpace.boundingRect());
-            QPolygonF boundingRectInLayerItemSpace = m_layerItem->mapFromScene(boundingRect);
+            QPolygonF boundingRectInLayerItemSpace = m_layerItem.data()->mapFromScene(boundingRect);
 
             QPen pen;
             pen.setColor(QColor(108, 141, 221));

diff --git a/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp b/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp
index dc8ee26..24a4a76 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp
@@ -56,7 +56,7 @@ SelectionRectangle::SelectionRectangle(QGraphicsObject *layerItem)
 SelectionRectangle::~SelectionRectangle()
 {
     if (m_layerItem)
-        m_layerItem->scene()->removeItem(m_controlShape);
+        m_layerItem.data()->scene()->removeItem(m_controlShape);
 }
 
 void SelectionRectangle::clear()

diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
index 9d9eace..f67bbbb 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
@@ -146,13 +146,13 @@ void QDeclarativeViewObserverPrivate::setViewport(QWidget *widget)
         return;
 
     if (viewport) {
-        viewport->removeEventFilter(q);
+        viewport.data()->removeEventFilter(q);
     }
     viewport = widget;
     if (viewport) {
         // make sure we get mouse move events
-        viewport->setMouseTracking(true);
-        viewport->installEventFilter(q);
+        viewport.data()->setMouseTracking(true);
+        viewport.data()->installEventFilter(q);
     }
 }
 

diff --git a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
index 271986a..0706d8c 100644 (file)
--- a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
+++ b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
@@ -62,8 +62,6 @@ SOURCES += \
         editor/toolbarcolorbox.cpp
 
     RESOURCES += editor/editor.qrc
-
-    DEFINES += QWEAKPOINTER_ENABLE_ARROW
 }
 
 OTHER_FILES += qmljsdebugger.pri