diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 09:00:23 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 09:00:23 +1000 |
| commit | 897014a47b41dcf2b9d91549be9b96890d5291c7 (patch) | |
| tree | 91da900adb42122eebdef573c012051ea511e42d /src/corelib/statemachine/qstatemachine_p.h | |
| parent | 37cdd053623bfadded77ba6ad34e0d4c45158cc7 (diff) | |
| parent | 2076f150995e541308b1d8da936b3e12ab68b886 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/statemachine/qstatemachine_p.h')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine_p.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index 387e42e1d..f0f74d659 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -79,7 +79,7 @@ class QAbstractAnimation; #endif class QStateMachine; -class Q_AUTOTEST_EXPORT QStateMachinePrivate : public QStatePrivate +class Q_CORE_EXPORT QStateMachinePrivate : public QStatePrivate { Q_DECLARE_PUBLIC(QStateMachine) public: @@ -214,11 +214,7 @@ public: f_cloneEvent cloneEvent; }; - static -#ifndef QT_BUILD_INTERNAL // otherwise Q_AUTOTEST_EXPORT exports it all - Q_CORE_EXPORT -#endif - const Handler *handler; + static const Handler *handler; }; QT_END_NAMESPACE |