Commit fbedfdc4 authored by lm's avatar lm

Fixed compile error on Linux

parent 779a2015
......@@ -38,18 +38,9 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>22</height>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="menuMGround">
<property name="title">
<string>File</string>
</property>
<addaction name="actionJoystickSettings"/>
<addaction name="actionSimulate"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuUnmanned_System">
<property name="title">
<string>Unmanned System</string>
......@@ -99,6 +90,15 @@
<string>Select System</string>
</property>
</widget>
<widget class="QMenu" name="menuMGround">
<property name="title">
<string>File</string>
</property>
<addaction name="actionJoystickSettings"/>
<addaction name="actionSimulate"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
<addaction name="menuMGround"/>
<addaction name="menuNetwork"/>
<addaction name="menuConnected_Systems"/>
......
......@@ -159,9 +159,10 @@ void QGCGoogleEarthView::updateState()
webViewMac->page()->currentFrame()->evaluateJavaScript(QString("updateFollowAircraft()"));
}
}
}
#endif
}
}
void QGCGoogleEarthView::changeEvent(QEvent *e)
{
......
......@@ -50,7 +50,7 @@ This file is part of the PIXHAWK project
#define CONTROL_MODE_TEST2 "MODE TEST2"
#define CONTROL_MODE_TEST3 "MODE TEST3"
#define CONTROL_MODE_READY "MODE TEST3"
#define CONTROL_MODE_RC_TRAINING "MODE RC TRAINING"
#define CONTROL_MODE_RC_TRAINING "RC SIMULATION"
#define CONTROL_MODE_LOCKED_INDEX 1
#define CONTROL_MODE_MANUAL_INDEX 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment