diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-02 13:12:21 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-02 13:12:21 +0100 |
| commit | 615534f14ce9e0a9ad872ffe7952bc5c8e0f9534 (patch) | |
| tree | 2981abe57ad61eb1f28d9b3d188314fb09e0fd87 /src/corelib/statemachine/qstate_p.h | |
| parent | 8fd093e47c44f4efc63a80d3ddcdc138afb8230c (diff) | |
| parent | ba8d3430029d8c4342e9a47c110ee8c9879818f4 (diff) | |
Merge 5.6 into 5.6.0
Change-Id: I95962e28b6fc101cbbad41230585e2b61f1f6c0f
Diffstat (limited to 'src/corelib/statemachine/qstate_p.h')
| -rw-r--r-- | src/corelib/statemachine/qstate_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h index 3b8dae9499..938822bcda 100644 --- a/src/corelib/statemachine/qstate_p.h +++ b/src/corelib/statemachine/qstate_p.h @@ -45,6 +45,7 @@ // We mean it. // +#include "qstate.h" #include "private/qabstractstate_p.h" #include <QtCore/qlist.h> @@ -52,6 +53,8 @@ #include <QtCore/qpointer.h> #include <QtCore/qvariant.h> +#ifndef QT_NO_STATEMACHINE + QT_BEGIN_NAMESPACE #ifndef QT_NO_PROPERTIES @@ -83,7 +86,7 @@ class QAbstractTransition; class QHistoryState; class QState; -class Q_AUTOTEST_EXPORT QStatePrivate : public QAbstractStatePrivate +class Q_CORE_EXPORT QStatePrivate : public QAbstractStatePrivate { Q_DECLARE_PUBLIC(QState) public: @@ -115,4 +118,6 @@ public: QT_END_NAMESPACE +#endif // QT_NO_STATEMACHINE + #endif |