Update all files that use a QML Menu item to QtQuick.Controls 2.4 to solve the issue of a menu showing up in random places on Android.

src/FlightDisplay/FlightDisplayViewMap.qml

@@ -8,11 +8,11 @@
  ****************************************************************************/
 
 
-import QtQuick          2.4
+import QtQuick                      2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls             2.4
-import QtLocation       5.3
+import QtLocation                   5.3
-import QtPositioning    5.3
+import QtPositioning                5.3
-import QtQuick.Dialogs  1.2
+import QtQuick.Dialogs              1.2
 
 import QGroundControl               1.0
 import QGroundControl.Airspace      1.0
@@ -176,10 +176,6 @@ FlightMap {
         }
     }
 
-    ExclusiveGroup {
-        id: _mapTypeButtonsExclusiveGroup
-    }
-
     MapFitFunctions {
         id:                         mapFitFunctions // The name for this id cannot be changed without breaking references outside of this code. Beware!
         map:                        mainWindow.flightDisplayMap

src/MissionManager/QGCMapPolygonVisuals.qml

@@ -7,11 +7,11 @@
  *
  ****************************************************************************/
 
-import QtQuick          2.3
+import QtQuick                      2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls             2.4
-import QtLocation       5.3
+import QtLocation                   5.3
-import QtPositioning    5.3
+import QtPositioning                5.3
-import QtQuick.Dialogs  1.2
+import QtQuick.Dialogs              1.2
 
 import QGroundControl                   1.0
 import QGroundControl.ScreenTools       1.0

src/MissionManager/QGCMapPolylineVisuals.qml

@@ -7,11 +7,11 @@
  *
  ****************************************************************************/
 
-import QtQuick          2.3
+import QtQuick                      2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls             2.4
-import QtLocation       5.3
+import QtLocation                   5.3
-import QtPositioning    5.3
+import QtPositioning                5.3
-import QtQuick.Dialogs  1.2
+import QtQuick.Dialogs              1.2
 
 import QGroundControl                   1.0
 import QGroundControl.ScreenTools       1.0

src/PlanView/MissionItemEditor.qml

@@ -1,8 +1,8 @@
-import QtQuick                  2.3
+import QtQuick                      2.11
-import QtQuick.Controls         1.2
+import QtQuick.Controls             2.4
-import QtQuick.Controls.Styles  1.4
+import QtQuick.Controls.Styles      1.4
-import QtQuick.Dialogs          1.2
+import QtQuick.Dialogs              1.2
-import QtQml                    2.2
+import QtQml                        2.2
 
 import QGroundControl               1.0
 import QGroundControl.ScreenTools   1.0

src/PlanView/PlanView.qml

@@ -264,12 +264,6 @@ Item {
         }
     }
 
-    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
-
-    ExclusiveGroup {
-        id: _mapTypeButtonsExclusiveGroup
-    }
-
     /// Inserts a new simple mission item
     ///     @param coordinate Location to insert item
     ///     @param index Insert item at this index
@@ -1031,7 +1025,7 @@ Item {
                 }
 
                 QGCButton {
-                    text:               qsTr("Save Mission Waypoints As KML...")                    
+                    text:               qsTr("Save Mission Waypoints As KML...")
                     Layout.columnSpan:  2
                     enabled:            !_planMasterController.syncInProgress && _visualItems.count > 1
                     onClicked: {

src/PlanView/RallyPointItemEditor.qml

@@ -1,6 +1,6 @@
-import QtQuick          2.3
+import QtQuick                      2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls             2.4
-import QtQuick.Layouts  1.2
+import QtQuick.Layouts              1.11
 
 import QGroundControl.ScreenTools   1.0
 import QGroundControl.Vehicle       1.0

src/PlanView/SimpleItemEditor.qml

@@ -1,8 +1,7 @@
-import QtQuick                  2.3
+import QtQuick                      2.11
-import QtQuick.Controls         1.2
+import QtQuick.Controls             2.4
-import QtQuick.Controls.Styles  1.4
+import QtQuick.Controls.Styles      1.4
-import QtQuick.Dialogs          1.2
+import QtQuick.Layouts              1.11
-import QtQuick.Layouts          1.2
 
 import QGroundControl               1.0
 import QGroundControl.ScreenTools   1.0

src/QmlControls/FlightModeMenu.qml

@@ -7,8 +7,8 @@
  *
  ****************************************************************************/
 
-import QtQuick          2.3
+import QtQuick                      2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls             2.4
 
 import QGroundControl               1.0
 import QGroundControl.Controls      1.0

src/QmlControls/ParameterEditor.qml

@@ -7,10 +7,10 @@
  *
  ****************************************************************************/
 
-import QtQuick          2.3
+import QtQuick                      2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls             2.4
-import QtQuick.Dialogs  1.2
+import QtQuick.Dialogs              1.2
-import QtQuick.Layouts  1.2
+import QtQuick.Layouts              1.11
 
 import QGroundControl               1.0
 import QGroundControl.Controls      1.0

src/QmlControls/QGCFileDialog.qml

@@ -1,7 +1,7 @@
-import QtQuick          2.3
+import QtQuick                      2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls             2.4
-import QtQuick.Dialogs  1.2
+import QtQuick.Dialogs              1.2
-import QtQuick.Layouts  1.2
+import QtQuick.Layouts              1.11
 
 import QGroundControl               1.0
 import QGroundControl.ScreenTools   1.0

src/QmlControls/QmlTest.qml

@@ -1,7 +1,7 @@
 import QtQuick                  2.11
 import QtQuick.Controls         2.4
 import QtQuick.Controls.Styles  1.4
-import QtQuick.Layouts          1.2
+import QtQuick.Layouts          1.11
 
 import QGroundControl.Palette       1.0
 import QGroundControl.Controls      1.0

src/ui/toolbar/LinkIndicator.qml

@@ -8,8 +8,8 @@
  ****************************************************************************/
 
 
-import QtQuick          2.3
+import QtQuick                              2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls                     2.4
 
 import QGroundControl                       1.0
 import QGroundControl.Controls              1.0

src/ui/toolbar/ModeIndicator.qml

@@ -8,8 +8,8 @@
  ****************************************************************************/
 
 
-import QtQuick          2.3
+import QtQuick                              2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls                     2.4
 
 import QGroundControl                       1.0
 import QGroundControl.Controls              1.0

src/ui/toolbar/MultiVehicleSelector.qml

@@ -8,8 +8,8 @@
  ****************************************************************************/
 
 
-import QtQuick          2.3
+import QtQuick                              2.11
-import QtQuick.Controls 1.2
+import QtQuick.Controls                     2.4
 
 import QGroundControl                       1.0
 import QGroundControl.Controls              1.0