diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 11:58:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 11:58:56 (GMT) |
| commit | d9dd68c4400c3ca590ea425d6f3d070ea6094099 (patch) | |
| tree | cdfbec67e182670673ac957f11708ddbaf2fc26b /src/gui/kernel | |
| parent | 978daedf73ba7aecf9ea9f83c9108308e4303d6e (diff) | |
| parent | 19ebb3f5b2f599018594e9f0dd3b9de81f584262 (diff) | |
| download | Qt-d9dd68c4400c3ca590ea425d6f3d070ea6094099.zip Qt-d9dd68c4400c3ca590ea425d6f3d070ea6094099.tar.gz Qt-d9dd68c4400c3ca590ea425d6f3d070ea6094099.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove enums from bitfield, since all compilers do not support them.
Fixed compile error in runonphone.
Use QImage 'convertInPlace' versions in QVGPixmapData load functions.
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qaction_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index 899b01b..5764318 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -112,12 +112,12 @@ public: //for soft keys management uint forceEnabledInSoftkeys : 1; uint menuActionSoftkeys : 1; - - QAction::MenuRole menuRole : 3; - QAction::SoftKeyRole softKeyRole : 2; - QAction::Priority priority : 14; int iconVisibleInMenu : 3; // Only has values -1, 0, and 1 + QAction::MenuRole menuRole; + QAction::SoftKeyRole softKeyRole; + QAction::Priority priority; + QList<QWidget *> widgets; #ifndef QT_NO_GRAPHICSVIEW QList<QGraphicsWidget *> graphicsWidgets; |