feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJsDebugger: Remove QWEAKPOINTER_ENABLE_ARROW define

Browse Source 
Any DEFINE used in qmljsdebugger-lib.pri is also passed to the users
code.
This commit is contained in:
Kai Koehne
2010-11-22 16:15:08 +01:00
parent 28adb0a178
commit ff7abee83b
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp
+2 -2
View File
@@ -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));
share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp
+1 -1
View File
@@ -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()
share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
+3 -3
View File
@@ -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);
}
}
share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
-2
View File
@@ -62,8 +62,6 @@ SOURCES += \
editor/toolbarcolorbox.cpp
RESOURCES += editor/editor.qrc
DEFINES += QWEAKPOINTER_ENABLE_ARROW
}
OTHER_FILES += qmljsdebugger.pri