Commit ff7abee8 authored by Kai Koehne's avatar Kai Koehne
Browse files

QmlJsDebugger: Remove QWEAKPOINTER_ENABLE_ARROW define

Any DEFINE used in qmljsdebugger-lib.pri is also passed to the users
code.
parent 28adb0a1
......@@ -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));
......
......@@ -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()
......
......@@ -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);
}
}
......
......@@ -62,8 +62,6 @@ SOURCES += \
editor/toolbarcolorbox.cpp
RESOURCES += editor/editor.qrc
DEFINES += QWEAKPOINTER_ENABLE_ARROW
}
OTHER_FILES += qmljsdebugger.pri
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment