Merge pull request #4725 from DonLakeFlyer/Power

Power: Page not loading correctly

src/AutoPilotPlugins/PX4/PowerComponent.qml

@@ -29,11 +29,6 @@ SetupPage {
             width:  Math.max(availableWidth, innerColumn.width)
             height: innerColumn.height
 
-            ColumnLayout {
-                id:                         innerColumn
-                anchors.horizontalCenter:   parent.horizontalCenter
-                spacing:                    ScreenTools.defaultFontPixelHeight
-
             property int textEditWidth:    ScreenTools.defaultFontPixelWidth * 8
 
             property Fact battNumCells:         controller.getParameterFact(-1, "BAT_N_CELLS")
@@ -47,6 +42,10 @@ SetupPage {
             readonly property string highlightPrefix:   "<font color=\"" + qgcPal.warningText + "\">"
             readonly property string highlightSuffix:   "</font>"
 
+            ColumnLayout {
+                id:                         innerColumn
+                anchors.horizontalCenter:   parent.horizontalCenter
+                spacing:                    ScreenTools.defaultFontPixelHeight
 
                 function getBatteryImage()
                 {

src/QmlControls/QGCGroupBox.qml

@@ -8,7 +8,7 @@
  ****************************************************************************/
 
 import QtQuick          2.3
-import QtQuick.Controls         1.2
+import QtQuick.Controls 2.0
 
 import QGroundControl.Palette       1.0
 import QGroundControl.ScreenTools   1.0