diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-19 11:55:38 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-29 16:00:10 (GMT) |
| commit | 6eb1faad9511dde6ab31b9a4f75fce0bdfbdc12c (patch) | |
| tree | bdfea038c1d37340946c3986eb405f9ce48eae44 /src/corelib/global/qfeatures.h | |
| parent | e55810dc838e95c60a275f1ea3be3bb6bb93fb83 (diff) | |
| download | Qt-6eb1faad9511dde6ab31b9a4f75fce0bdfbdc12c.zip Qt-6eb1faad9511dde6ab31b9a4f75fce0bdfbdc12c.tar.gz Qt-6eb1faad9511dde6ab31b9a4f75fce0bdfbdc12c.tar.bz2 | |
Fixed MENU and QWS_PROXYSCREEN
Reviewed-by: tom
Diffstat (limited to 'src/corelib/global/qfeatures.h')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 1266be1..c9dfabb 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -417,6 +417,16 @@ #define QT_NO_QWS_MANAGER #endif +// QVncTransformed +#if !defined(QT_NO_QWS_TRANSFORMED) && (defined(QT_NO_QWS_PROXYSCREEN)) +#define QT_NO_QWS_TRANSFORMED +#endif + +// QVncScreen +#if !defined(QT_NO_QWS_VNC) && (defined(QT_NO_QWS_PROXYSCREEN)) +#define QT_NO_QWS_VNC +#endif + // QScrollBar #if !defined(QT_NO_SCROLLBAR) && (defined(QT_NO_SLIDER)) #define QT_NO_SCROLLBAR @@ -492,11 +502,6 @@ #define QT_NO_XMLSTREAMWRITER #endif -// Accessibility -#if !defined(QT_NO_ACCESSIBILITY) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_ACTION)) -#define QT_NO_ACCESSIBILITY -#endif - // Context menu #if !defined(QT_NO_CONTEXTMENU) && (defined(QT_NO_MENU)) #define QT_NO_CONTEXTMENU @@ -617,6 +622,11 @@ #define QT_NO_UNDOGROUP #endif +// Accessibility +#if !defined(QT_NO_ACCESSIBILITY) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_ACTION) || defined(QT_NO_MENU)) +#define QT_NO_ACCESSIBILITY +#endif + // The Model/View Framework #if !defined(QT_NO_ITEMVIEWS) && (defined(QT_NO_RUBBERBAND) || defined(QT_NO_SCROLLAREA)) #define QT_NO_ITEMVIEWS |