Changeset 846 for trunk/src/gui/kernel/qaction_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qaction_p.h (modified) (3 diffs)

trunk/src/gui/kernel/qaction_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -76 +76 @@
     ~QActionPrivate();
 
+    static QActionPrivate *get(QAction *q)
+    {
+        return q->d_func();
+    }
+
     bool showStatusText(QWidget *w, const QString &str);
 
@@ -104 +109 @@
     uint separator : 1;
     uint fontSet : 1;
+
+    //for soft keys management
+    uint forceEnabledInSoftkeys : 1;
+    uint menuActionSoftkeys : 1;
+    int iconVisibleInMenu : 3;  // Only has values -1, 0, and 1
+
     QAction::MenuRole menuRole;
     QAction::SoftKeyRole softKeyRole;
     QAction::Priority priority;
-    int iconVisibleInMenu : 3;  // Only has values -1, 0, and 1
+
     QList<QWidget *> widgets;
 #ifndef QT_NO_GRAPHICSVIEW