From 435122de9209b9faf13d66e1ca1adfeb092282ae Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 20 Nov 2020 19:53:36 +0200 Subject: [PATCH 1/2] Fix build on Windows. (cherry picked from commit 8aea612202a4eb948899ea53f1dcb53e15ec3e46) --- src/libs/qmuparser/qmuparsercallback.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/qmuparser/qmuparsercallback.h b/src/libs/qmuparser/qmuparsercallback.h index d58ef6fb8..86a6377c9 100644 --- a/src/libs/qmuparser/qmuparsercallback.h +++ b/src/libs/qmuparser/qmuparsercallback.h @@ -28,6 +28,7 @@ #include #include +#include "qmuparser_global.h" #include "qmuparserdef.h" #include "qmuparsercallback_p.h" @@ -49,7 +50,7 @@ namespace qmu * * @author (C) 2004-2011 Ingo Berg */ -class QmuParserCallback +class QMUPARSERSHARED_EXPORT QmuParserCallback { public: QmuParserCallback(fun_type0 a_pFun, bool a_bAllowOpti); From d8c1c8e4d4caf25c6c44042e831d67b1dfc67960 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 20 Nov 2020 20:39:42 +0200 Subject: [PATCH 2/2] Generate new uuid for a piece duplicate. --- src/libs/vtools/tools/vtoolseamallowance.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index ceba1678f..347ab5d85 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -204,6 +204,7 @@ VToolSeamAllowance *VToolSeamAllowance::Duplicate(VToolSeamAllowanceInitData &in dupDetail.SetInternalPaths(DuplicateInternalPaths(initData.detail.GetInternalPaths(), initData)); dupDetail.SetPins(DuplicatePins(initData.detail.GetPins(), initData)); dupDetail.SetPlaceLabels(DuplicatePlaceLabels(initData.detail.GetPlaceLabels(), initData)); + dupDetail.SetUUID(QUuid::createUuid()); initData.detail = dupDetail; return VToolSeamAllowance::Create(initData);