OSDN Git Service

Fix shortcut handling.
authorcon <qtc-committer@nokia.com>
Thu, 13 Jan 2011 10:35:22 +0000 (11:35 +0100)
committercon <qtc-committer@nokia.com>
Thu, 13 Jan 2011 10:40:21 +0000 (11:40 +0100)
Introduced by recent ProxyAction refactoring, we may not copy the actual
enabled/visible/checked state during initialization.

src/libs/utils/proxyaction.cpp

index 0353594..8507dc8 100644 (file)
@@ -137,10 +137,12 @@ void ProxyAction::update(QAction *action, bool initialize)
     }
 
     setCheckable(action->isCheckable());
-    setChecked(action->isChecked());
 
-    setEnabled(action->isEnabled());
-    setVisible(action->isVisible());
+    if (!initialize) {
+        setChecked(action->isChecked());
+        setEnabled(action->isEnabled());
+        setVisible(action->isVisible());
+    }
     connectAction();
     connect(this, SIGNAL(changed()), this, SLOT(updateToolTipWithKeySequence()));
 }