aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/feature/manual-layout' into feature/manual-layout

Browse Source
This commit is contained in:
Ronan Le Tiec 2020-11-20 22:45:05 +01:00
commit 3cb79b32e2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/qmuparser/qmuparsercallback.h
View File

@ -28,6 +28,7 @@
#include <QTypeInfo> #include <QTypeInfo>
#include <QSharedDataPointer> #include <QSharedDataPointer>
#include "qmuparser_global.h"
#include "qmuparserdef.h" #include "qmuparserdef.h"
#include "qmuparsercallback_p.h" #include "qmuparsercallback_p.h"
@ -49,7 +50,7 @@ namespace qmu
* *
* @author (C) 2004-2011 Ingo Berg * @author (C) 2004-2011 Ingo Berg
*/ */
class QmuParserCallback class QMUPARSERSHARED_EXPORT QmuParserCallback
{ {
public: public:
QmuParserCallback(fun_type0 a_pFun, bool a_bAllowOpti); QmuParserCallback(fun_type0 a_pFun, bool a_bAllowOpti);

1
src/libs/vtools/tools/vtoolseamallowance.cpp
View File

@ -204,6 +204,7 @@ VToolSeamAllowance *VToolSeamAllowance::Duplicate(VToolSeamAllowanceInitData &in
dupDetail.SetInternalPaths(DuplicateInternalPaths(initData.detail.GetInternalPaths(), initData)); dupDetail.SetInternalPaths(DuplicateInternalPaths(initData.detail.GetInternalPaths(), initData));
dupDetail.SetPins(DuplicatePins(initData.detail.GetPins(), initData)); dupDetail.SetPins(DuplicatePins(initData.detail.GetPins(), initData));
dupDetail.SetPlaceLabels(DuplicatePlaceLabels(initData.detail.GetPlaceLabels(), initData)); dupDetail.SetPlaceLabels(DuplicatePlaceLabels(initData.detail.GetPlaceLabels(), initData));
dupDetail.SetUUID(QUuid::createUuid());
initData.detail = dupDetail; initData.detail = dupDetail;
return VToolSeamAllowance::Create(initData); return VToolSeamAllowance::Create(initData);