Merge branch 'master' of github.com:mavlink/qgroundcontrol into message_view

src/ui/MainWindow.cc

@@ -569,7 +569,7 @@ void MainWindow::buildCommonWidgets()
     }
 #endif
 
-#if (defined _MSC_VER) | (defined Q_OS_MAC)
+#if QGC_GOOGLE_EARTH_ENABLED
     if (!googleEarthView)
     {
         googleEarthView = new SubMainWindow(this);

src/ui/QGCPX4VehicleConfig.cc

@@ -165,14 +165,18 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
     connect(ui->advancedCheckBox, SIGNAL(clicked(bool)), ui->advancedGroupBox, SLOT(setVisible(bool)));
     ui->advancedGroupBox->setVisible(false);
 
+#if 0
+    // XXX WIP don't connect signal until completed, otherwise view will show after advanced is turned on and then off
     connect(ui->advancedCheckBox, SIGNAL(clicked(bool)), ui->graphicsView, SLOT(setHidden(bool)));
+    ui->graphicsView->setVisible(true);
     ui->graphicsView->setScene(&scene);
 
     scene.addPixmap(planeBack);
     scene.addPixmap(planeSide);
-
+#else
     // XXX hide while WIP
     ui->graphicsView->hide();
+#endif
 
     ui->rcCalibrationButton->setCheckable(true);
     ui->rcCalibrationButton->setEnabled(false);