diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-08-17 16:03:48 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-08-17 15:15:09 +0000 |
| commit | e9cf90a22ed562e17f1169ac48cc413d80bd5025 (patch) | |
| tree | 6b6c74d5548581bed95b9b4ee3068d659ef9cda1 /src | |
| parent | 5671c31a5141fed64edbe53fece895b2fd7449d3 (diff) | |
Pre-declare some meta types in the headers
It doesn't make much sense to declare the meta type for QScxmlError in
all the tests. Also, types exposed through Q_PROPERTY should be
declared.
Change-Id: Ibb08440e1f40845ea779e1c2a3882bc1b1e0a935
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/scxml/qscxmldatamodel.h | 2 | ||||
| -rw-r--r-- | src/scxml/qscxmlerror.h | 4 | ||||
| -rw-r--r-- | src/scxml/qscxmlstatemachine.h | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/scxml/qscxmldatamodel.h b/src/scxml/qscxmldatamodel.h index bb86c81..c5e57ad 100644 --- a/src/scxml/qscxmldatamodel.h +++ b/src/scxml/qscxmldatamodel.h @@ -98,4 +98,6 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QScxmlDataModel *) + #endif // QSCXMLDATAMODEL_H diff --git a/src/scxml/qscxmlerror.h b/src/scxml/qscxmlerror.h index cc8d53b..6e6e459 100644 --- a/src/scxml/qscxmlerror.h +++ b/src/scxml/qscxmlerror.h @@ -42,7 +42,7 @@ #include <QtScxml/qscxmlglobals.h> #include <QtCore/qobjectdefs.h> - +#include <QtCore/qmetatype.h> #include <QtCore/qstring.h> QT_BEGIN_NAMESPACE @@ -81,4 +81,6 @@ private: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QScxmlError) + #endif // QSCXMLERROR_H diff --git a/src/scxml/qscxmlstatemachine.h b/src/scxml/qscxmlstatemachine.h index e437eb2..2017444 100644 --- a/src/scxml/qscxmlstatemachine.h +++ b/src/scxml/qscxmlstatemachine.h @@ -45,6 +45,7 @@ #include <QtScxml/qscxmlerror.h> #include <QtScxml/qscxmlevent.h> #include <QtScxml/qscxmlcompiler.h> +#include <QtScxml/qscxmlinvokableservice.h> #include <QtCore/qstring.h> #include <QtCore/qvector.h> @@ -58,7 +59,6 @@ QT_BEGIN_NAMESPACE class QIODevice; class QXmlStreamWriter; class QTextStream; -class QScxmlInvokableService; class QScxmlStateMachinePrivate; class Q_SCXML_EXPORT QScxmlStateMachine: public QObject @@ -355,4 +355,7 @@ private: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QScxmlStateMachine *) +Q_DECLARE_METATYPE(QVector<QScxmlInvokableService *>) + #endif // QSCXMLSTATEMACHINE_H |