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

QmlDesigner: Fix tests build

Browse Source 
Change-Id: I65190e74a3dfb76991650463bf91b40a285d7384
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Aleksei German
2020-11-06 17:21:46 +01:00
parent 81c4d59346
commit 4e4ec44a5d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
View File

@@ -38,7 +38,6 @@
#include "rewriterview.h" #include "rewriterview.h"
#include "modelmerger.h" #include "modelmerger.h"
#include "rewritingexception.h" #include "rewritingexception.h"
#include "designermcumanager.h"
#include <QUrl> #include <QUrl>
#include <QPlainTextEdit> #include <QPlainTextEdit>
@@ -47,6 +46,10 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#ifndef QMLDESIGNER_TEST
#include <designermcumanager.h>
#endif
namespace QmlDesigner { namespace QmlDesigner {
bool QmlItemNode::isItemOrWindow(const ModelNode &modelNode) bool QmlItemNode::isItemOrWindow(const ModelNode &modelNode)
@@ -287,7 +290,9 @@ bool QmlItemNode::modelIsResizable() const
&& !modelIsInLayout(); && !modelIsInLayout();
} }
static bool isMcuRotationAllowed(QString itemName, bool hasChildren) { static bool isMcuRotationAllowed(QString itemName, bool hasChildren)
{
#ifndef QMLDESIGNER_TEST
const QString propName = "rotation"; const QString propName = "rotation";
const DesignerMcuManager &manager = DesignerMcuManager::instance(); const DesignerMcuManager &manager = DesignerMcuManager::instance();
if (manager.isMCUProject()) { if (manager.isMCUProject()) {
@@ -307,6 +312,7 @@ static bool isMcuRotationAllowed(QString itemName, bool hasChildren) {
if (manager.bannedProperties().contains(propName)) if (manager.bannedProperties().contains(propName))
return false; return false;
} }
#endif
return true; return true;
} }