diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-02-09 12:18:25 +0100 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-02-09 14:05:35 +0000 |
commit | b8f4445ea1bcaaf6609947e9f9df84b75478adc1 (patch) | |
tree | dab318de8934ceb725b92f4ef016b8af2f7d11c1 | |
parent | c18186275a15d912f72ebff3526eda41e6f7d614 (diff) | |
download | qt-creator-b8f4445ea1bcaaf6609947e9f9df84b75478adc1.tar.gz |
QmlDesigner: Adding logging to form editor
These logs are useful to debug hints and form editor
behavivour. Adding more if required.
I cleaned up the include order.
Change-Id: I39b8c4e215ba4e6a524f4b00828156d6e56d8eb7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r-- | src/plugins/qmldesigner/components/formeditor/dragtool.cpp | 12 | ||||
-rw-r--r-- | src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp | 13 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index e1c39322f5..08629f32fb 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -31,12 +31,15 @@ #include <nodehints.h> #include <rewritingexception.h> -#include <QGraphicsSceneMouseEvent> #include <QDebug> +#include <QGraphicsSceneMouseEvent> +#include <QLoggingCategory> #include <QMimeData> #include <QTimer> #include <QWidget> +static Q_LOGGING_CATEGORY(dragToolInfo, "qtc.qmldesigner.formeditor"); + namespace QmlDesigner { @@ -365,7 +368,12 @@ void DragTool::move(const QPointF &scenePosition, const QList<QGraphicsItem*> & if (containerItem && m_movingItem->parentItem() && containerItem != m_movingItem->parentItem()) { - if (m_movingItem->qmlItemNode().canBereparentedTo(containerItem->qmlItemNode())) + const QmlItemNode movingNode = m_movingItem->qmlItemNode(); + const QmlItemNode containerNode = containerItem->qmlItemNode(); + + qCInfo(dragToolInfo()) << Q_FUNC_INFO << movingNode << containerNode << movingNode.canBereparentedTo(containerNode); + + if (movingNode.canBereparentedTo(containerNode)) m_moveManipulator.reparentTo(containerItem); } diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp index f591073e5b..88064d386a 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp @@ -28,15 +28,18 @@ #include "formeditoritem.h" #include "formeditorscene.h" -#include <QPointF> -#include <QDebug> - -#include <limits> #include <qmlanchors.h> #include <nodemetainfo.h> #include <variantproperty.h> #include <nodeabstractproperty.h> +#include <QDebug> +#include <QLoggingCategory> +#include <QPointF> + +#include <limits> + +static Q_LOGGING_CATEGORY(moveManipulatorInfo, "qtc.qmldesigner.formeditor"); namespace QmlDesigner { @@ -335,6 +338,8 @@ void MoveManipulator::reparentTo(FormEditorItem *newParent) if (!itemsCanReparented()) return; + qCInfo(moveManipulatorInfo()) << Q_FUNC_INFO << newParent->qmlItemNode(); + if (!newParent->qmlItemNode().modelNode().metaInfo().isLayoutable() && newParent->qmlItemNode().modelNode().hasParentProperty()) { ModelNode grandParent = newParent->qmlItemNode().modelNode().parentProperty().parentModelNode(); |