diff options
| author | axis <qt-info@nokia.com> | 2009-11-05 10:32:55 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-05 10:32:55 (GMT) |
| commit | dd6a230f812b957137a2711c772284ee77ffccf4 (patch) | |
| tree | a1f46718a295964ddaa9ab04c8222f6db3b19057 /src/corelib | |
| parent | f1a56f4db2f6d6c395ac6e7023b6e9184140d571 (diff) | |
| parent | eb75d1d6acf121fc08a591b4d6b34f1f39283bc2 (diff) | |
| download | Qt-dd6a230f812b957137a2711c772284ee77ffccf4.zip Qt-dd6a230f812b957137a2711c772284ee77ffccf4.tar.gz Qt-dd6a230f812b957137a2711c772284ee77ffccf4.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 5 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 9b3e817..77785e8 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -632,6 +632,11 @@ #define QT_NO_COLORDIALOG #endif +// QGraphicsEffect +#if !defined(QT_NO_GRAPHICSEFFECT) && (defined(QT_NO_GRAPHICSVIEW)) +#define QT_NO_GRAPHICSEFFECT +#endif + // The Model/View Framework #if !defined(QT_NO_ITEMVIEWS) && (defined(QT_NO_RUBBERBAND) || defined(QT_NO_SCROLLAREA)) #define QT_NO_ITEMVIEWS diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index ff34006..ec4945f 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -491,6 +491,13 @@ Requires: SCROLLAREA Name: QGraphicsView SeeAlso: ??? +Feature: GRAPHICSEFFECT +Description: Supports the graphicseffect classes. +Section: Widgets +Requires: GRAPHICSVIEW +Name: QGraphicsEffect +SeeAlso: ??? + Feature: SPINWIDGET Description: Supports spinbox control widgets. Section: Widgets |