From 1bf2d0ab66a90db2bf278aef9a582e035f62e29a Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 13 Jan 2011 11:35:22 +0100
Subject: [PATCH] Fix shortcut handling.
Introduced by recent ProxyAction refactoring, we may not copy the actual
enabled/visible/checked state during initialization.
---
src/libs/utils/proxyaction.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/libs/utils/proxyaction.cpp b/src/libs/utils/proxyaction.cpp
index 0353594a44f..8507dc8e086 100644
--- a/src/libs/utils/proxyaction.cpp
+++ b/src/libs/utils/proxyaction.cpp
@@ -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()));
}
--
GitLab