From 4e4ec44a5df4764685f7ca52c2537419f0e7cb08 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Fri, 6 Nov 2020 17:21:46 +0100 Subject: [PATCH] QmlDesigner: Fix tests build Change-Id: I65190e74a3dfb76991650463bf91b40a285d7384 Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/model/qmlitemnode.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 7a1e7d05f4a..814d5494806 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -38,7 +38,6 @@ #include "rewriterview.h" #include "modelmerger.h" #include "rewritingexception.h" -#include "designermcumanager.h" #include #include @@ -47,6 +46,10 @@ #include +#ifndef QMLDESIGNER_TEST +#include +#endif + namespace QmlDesigner { bool QmlItemNode::isItemOrWindow(const ModelNode &modelNode) @@ -287,7 +290,9 @@ bool QmlItemNode::modelIsResizable() const && !modelIsInLayout(); } -static bool isMcuRotationAllowed(QString itemName, bool hasChildren) { +static bool isMcuRotationAllowed(QString itemName, bool hasChildren) +{ +#ifndef QMLDESIGNER_TEST const QString propName = "rotation"; const DesignerMcuManager &manager = DesignerMcuManager::instance(); if (manager.isMCUProject()) { @@ -307,6 +312,7 @@ static bool isMcuRotationAllowed(QString itemName, bool hasChildren) { if (manager.bannedProperties().contains(propName)) return false; } +#endif return true; }