[cmake-commits] clinton committed CMakeSetupDialog.cxx 1.25 1.26

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv25653

Modified Files:
	CMakeSetupDialog.cxx 
Log Message:
BUG:  Prevent mapping of Configure to Preferences when Qt merges menu items with
      the standard Mac OS X application menu.


Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- CMakeSetupDialog.cxx	13 Nov 2007 21:25:38 -0000	1.25
+++ CMakeSetupDialog.cxx	6 Dec 2007 19:07:52 -0000	1.26
@@ -100,6 +100,8 @@
 
   QMenu* ToolsMenu = this->menuBar()->addMenu(tr("&Tools"));
   this->ConfigureAction = ToolsMenu->addAction(tr("&Configure"));
+  // prevent merging with Preferences menu item on Mac OS X
+  this->ConfigureAction->setMenuRole(QAction::NoRole);
   QObject::connect(this->ConfigureAction, SIGNAL(triggered(bool)), 
                    this, SLOT(doConfigure()));
   this->GenerateAction = ToolsMenu->addAction(tr("&Generate"));