diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2009-09-16 15:14:22 (GMT) |
|---|---|---|
| committer | Jeremy Katz <jeremy.katz@nokia.com> | 2009-09-16 15:50:51 (GMT) |
| commit | 8caa3209ddfd0cc7944b3935c212acd97fbdfc0d (patch) | |
| tree | 5dac98efb053fe50bfd4e12843f1bbf580d8402f /src | |
| parent | 0ba2ae5bc54297ca01039cc3d921f66dfd8dd9b7 (diff) | |
| download | Qt-8caa3209ddfd0cc7944b3935c212acd97fbdfc0d.zip Qt-8caa3209ddfd0cc7944b3935c212acd97fbdfc0d.tar.gz Qt-8caa3209ddfd0cc7944b3935c212acd97fbdfc0d.tar.bz2 | |
have make_qfeatures_dot_h use QTSRCDIR if defined, update qfeatures.h
Reviewed-by: Paul
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index d925f40..29f46f6 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -446,6 +446,11 @@ #define QT_NO_SPLITTER #endif +// State machine +#if !defined(QT_NO_STATEMACHINE) && (defined(QT_NO_PROPERTIES)) +#define QT_NO_STATEMACHINE +#endif + // QCDEStyle #if !defined(QT_NO_STYLE_CDE) && (defined(QT_NO_STYLE_MOTIF)) #define QT_NO_STYLE_CDE @@ -616,11 +621,6 @@ #define QT_NO_QWS_SOUNDSERVER #endif -// QtScript -#if !defined(QT_NO_SCRIPT) && (defined(QT_NO_TEXTDATE) || defined(QT_NO_DATESTRING) || defined(QT_NO_PROPERTIES)) -#define QT_NO_SCRIPT -#endif - // QSvgGenerator #if !defined(QT_NO_SVGGENERATOR) && (defined(QT_NO_SVG)) #define QT_NO_SVGGENERATOR |