From 6293be63b19c414efd8d84e64214381bd0e62a3f Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 21 Nov 2014 14:42:32 -0800
Subject: [PATCH] Set correct roles on actions

This way OS X correctly positioned menu items
---
 src/ui/MainWindow.ui | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui
index a565aeae9..ebeddfe18 100644
--- a/src/ui/MainWindow.ui
+++ b/src/ui/MainWindow.ui
@@ -181,18 +181,6 @@
     <string>Add Link</string>
    </property>
   </action>
-  <action name="actionConfiguration">
-   <property name="icon">
-    <iconset resource="../../qgroundcontrol.qrc">
-     <normaloff>:/files/images/categories/applications-system.svg</normaloff>:/files/images/categories/applications-system.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Preferences</string>
-   </property>
-   <property name="toolTip">
-    <string>Open UAS Preferences</string>
-   </property>
-  </action>
   <action name="actionJoystickSettings">
    <property name="icon">
     <iconset resource="../../qgroundcontrol.qrc">
@@ -375,6 +363,9 @@
    <property name="toolTip">
     <string>Application settings</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::PreferencesRole</enum>
+   </property>
   </action>
   <action name="actionFullscreen">
    <property name="checkable">
@@ -442,6 +433,9 @@
    <property name="toolTip">
     <string>Setup of the vehicle</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionAdvanced_Mode">
    <property name="checkable">
-- 
2.22.0