diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-15 15:06:33 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-16 06:54:24 +0000 |
| commit | 8932ee2713c7c3a1b7245989a1344afb6615c90b (patch) | |
| tree | 651d5872227a3f2e7bad19761f30459699f31a15 /src | |
| parent | f5d07a38729a552c35b8b8c3931306417c1cac58 (diff) | |
Fix link error on Windows
QScxmlDataModel::ForeachLoopBody::~ForeachLoopBody() needs to
be exported for it to be used. Export the class, disable copying
and add a constructor, fixing the Clang warning:
warning: definition of implicit copy assignment operator for 'ForeachLoopBody' is deprecated because it has a user-declared destructor
Task-number: PYSIDE-487
Change-Id: I3f896d9e75a8da072a63cdab9924c58b0c36d482
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/scxml/qscxmldatamodel.cpp | 5 | ||||
| -rw-r--r-- | src/scxml/qscxmldatamodel.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/scxml/qscxmldatamodel.cpp b/src/scxml/qscxmldatamodel.cpp index b67628b..5f2ef2d 100644 --- a/src/scxml/qscxmldatamodel.cpp +++ b/src/scxml/qscxmldatamodel.cpp @@ -53,6 +53,11 @@ QT_BEGIN_NAMESPACE */ /*! + Creates a new foreach loop body. + */ +QScxmlDataModel::ForeachLoopBody::ForeachLoopBody() +{} +/*! Destroys a foreach loop body. */ QScxmlDataModel::ForeachLoopBody::~ForeachLoopBody() diff --git a/src/scxml/qscxmldatamodel.h b/src/scxml/qscxmldatamodel.h index c5e57ad..0c9e666 100644 --- a/src/scxml/qscxmldatamodel.h +++ b/src/scxml/qscxmldatamodel.h @@ -60,9 +60,11 @@ class Q_SCXML_EXPORT QScxmlDataModel : public QObject Q_PROPERTY(QScxmlStateMachine *stateMachine READ stateMachine WRITE setStateMachine NOTIFY stateMachineChanged) public: - class ForeachLoopBody + class Q_SCXML_EXPORT ForeachLoopBody { + Q_DISABLE_COPY(ForeachLoopBody) public: + ForeachLoopBody(); virtual ~ForeachLoopBody(); virtual void run(bool *ok) = 0; }; |