diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-06-11 12:06:41 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-06-11 12:06:41 (GMT) |
| commit | d92d1106e8cb2ca14b26b8c027d52608ee2915e9 (patch) | |
| tree | 91b75077ecf9fb4709f000b89d5963ab98cdfc9b /src/corelib/global/qconfig-small.h | |
| parent | a295a69e76ff330a2716c97b70723f0bd408f197 (diff) | |
| parent | 24bcac9de46c89f4d8b533946e7b0feeacca1b0d (diff) | |
| download | Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.zip Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.tar.gz Qt-d92d1106e8cb2ca14b26b8c027d52608ee2915e9.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/global/qconfig-small.h')
| -rw-r--r-- | src/corelib/global/qconfig-small.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h index 1716b8d..dd74dcf 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -250,6 +250,9 @@ #ifndef QT_NO_SYSTEMTRAYICON # define QT_NO_SYSTEMTRAYICON #endif +#ifndef QT_NO_GESTURES +# define QT_NO_GESTURES +#endif /* Widgets */ #ifndef QT_NO_LCDNUMBER |