diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-10-15 07:22:32 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-10-15 05:55:39 +0000 |
| commit | 70851d371d5f4c330aa564fd9e78b9c209897d9c (patch) | |
| tree | 08cc75d8376b10adcacd0c25f2c070174d7af9a3 /src/plugins/qmldesigner | |
| parent | 60567d385ad54d9eb958b8e6635487d2a4b19a78 (diff) | |
QmlDesigner: Fix compile of tests
Change-Id: Idd2097a7e571d5891c3769102bb7b0ebd9264ac6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index c4779543e84..e2ac5f63560 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -1496,7 +1496,11 @@ void NodeInstanceView::handlePuppetToCreatorCommand(const PuppetToCreatorCommand if (hasModelNodeForInternalId(container.instanceId()) && !image.isNull()) { auto node = modelNodeForInternalId(container.instanceId()); if (node.isValid()) { +#ifndef QMLDESIGNER_TEST const double ratio = QmlDesignerPlugin::formEditorDevicePixelRatio(); +#else + const double ratio = 1; +#endif const int dim = Constants::MODELNODE_PREVIEW_IMAGE_DIMENSIONS * ratio; if (image.height() != dim || image.width() != dim) image = image.scaled(dim, dim, Qt::KeepAspectRatio); @@ -1544,7 +1548,12 @@ void NodeInstanceView::requestModelNodePreviewImage(const ModelNode &node, const } else if (node.isComponent()) { componentPath = node.metaInfo().componentFileName(); } - const int dim = Constants::MODELNODE_PREVIEW_IMAGE_DIMENSIONS * QmlDesignerPlugin::formEditorDevicePixelRatio(); +#ifndef QMLDESIGNER_TEST + const double ratio = QmlDesignerPlugin::formEditorDevicePixelRatio(); +#else + const double ratio = 1; +#endif + const int dim = Constants::MODELNODE_PREVIEW_IMAGE_DIMENSIONS * ratio; m_nodeInstanceServer->requestModelNodePreviewImage( RequestModelNodePreviewImageCommand(instance.instanceId(), QSize(dim, dim), componentPath, renderItemId)); @@ -1589,7 +1598,11 @@ QVariant NodeInstanceView::previewImageDataForImageNode(const ModelNode &modelNo ModelNodePreviewImageData imageData; imageData.id = modelNode.id(); imageData.type = QString::fromLatin1(modelNode.type()); - const double ratio = QmlDesignerPlugin::formEditorDevicePixelRatio(); +#ifndef QMLDESIGNER_TEST + const double ratio = QmlDesignerPlugin::formEditorDevicePixelRatio(); +#else + const double ratio = 1; +#endif if (imageSource.isEmpty() && modelNode.isSubclassOf("QtQuick3D.Texture")) { // Texture node may have sourceItem instead |