Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
ff7abee8
Commit
ff7abee8
authored
Nov 22, 2010
by
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
Changes
4
Hide whitespace changes
Inline
Side-by-side
share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp
View file @
ff7abee8
...
...
@@ -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
View file @
ff7abee8
...
...
@@ -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
View file @
ff7abee8
...
...
@@ -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
View file @
ff7abee8
...
...
@@ -62,8 +62,6 @@ SOURCES += \
editor/toolbarcolorbox.cpp
RESOURCES += editor/editor.qrc
DEFINES += QWEAKPOINTER_ENABLE_ARROW
}
OTHER_FILES += qmljsdebugger.pri
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment