diff -r 93b982ccede2 -r 5daf16870df6 src/gui/kernel/qaction_p.h --- a/src/gui/kernel/qaction_p.h Mon Jun 21 22:38:13 2010 +0100 +++ b/src/gui/kernel/qaction_p.h Thu Jul 22 16:41:55 2010 +0100 @@ -75,6 +75,11 @@ QActionPrivate(); ~QActionPrivate(); + static QActionPrivate *get(QAction *q) + { + return q->d_func(); + } + bool showStatusText(QWidget *w, const QString &str); QPointer group; @@ -103,10 +108,16 @@ uint checked : 1; uint separator : 1; uint fontSet : 1; - QAction::MenuRole menuRole; - QAction::SoftKeyRole softKeyRole; - QAction::Priority priority; + + //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 + QList widgets; #ifndef QT_NO_GRAPHICSVIEW QList graphicsWidgets;