diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-06-04 14:05:19 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-06-04 14:05:19 (GMT) |
| commit | 5c23548a0a60ca25631cff2fa7f296fdbd15b78a (patch) | |
| tree | 0ea2c16452c89eed738a459f004afcfadac9d298 /src/gui/kernel | |
| parent | fcd1059f05be695b78f42c02446b17ab143ce9c0 (diff) | |
| download | Qt-5c23548a0a60ca25631cff2fa7f296fdbd15b78a.zip Qt-5c23548a0a60ca25631cff2fa7f296fdbd15b78a.tar.gz Qt-5c23548a0a60ca25631cff2fa7f296fdbd15b78a.tar.bz2 | |
add QT_NO_STATEMACHINE define so state machine can be compiled out
Reviewed-by: Thierry Bastian
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index a9424db..f2a3498 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -838,9 +838,11 @@ void QApplicationPrivate::initialize() // trigger registering of QVariant's GUI types extern int qRegisterGuiVariant(); qRegisterGuiVariant(); +#ifndef QT_NO_STATEMACHINE // trigger registering of QStateMachine's GUI types extern int qRegisterGuiStateMachine(); qRegisterGuiStateMachine(); +#endif is_app_running = true; // no longer starting up @@ -1062,9 +1064,11 @@ QApplication::~QApplication() QApplicationPrivate::fade_tooltip = false; QApplicationPrivate::widgetCount = false; +#ifndef QT_NO_STATEMACHINE // trigger unregistering of QStateMachine's GUI types extern int qUnregisterGuiStateMachine(); qUnregisterGuiStateMachine(); +#endif // trigger unregistering of QVariant's GUI types extern int qUnregisterGuiVariant(); qUnregisterGuiVariant(); |