projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f777773)
Remove menu role conflict for preferences dialog
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Thu, 27 Sep 2012 15:07:19 +0000 (17:07 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 16 Oct 2012 21:50:40 +0000 (23:50 +0200)
That conflict would result on the preferences dialog not being
accessible on Mac.

Change-Id: Ibd2e370c3e29f672d0df847ecf90ea1022a20fdc
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
src/designer/src/designer/qdesigner_actions.cpp patch | blob | history

diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index d5998b4..9f77132 100644 (file)
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -369,7 +369,6 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
     m_settingsActions->addAction(m_preferencesAction);
 
     connect(m_appFontAction, SIGNAL(triggered()),  this, SLOT(showAppFontDialog()));
-    m_appFontAction->setMenuRole(QAction::PreferencesRole);
     m_settingsActions->addAction(m_appFontAction);
 //
 // form actions
Domain: UI Framework / Qt;