Merge branch 'win_fixes' of github.com:Susurrus/qgroundcontrol into integration_merge_connstatus

src/ui/MainWindow.cc

@@ -231,7 +231,7 @@ void MainWindow::init()
     joystick = new JoystickInput();
 
 #ifdef MOUSE_ENABLED_WIN
-    emit initStatusChanged(tr("Initializing 3D mouse interface", Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
+    emit initStatusChanged(tr("Initializing 3D mouse interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
 
     mouseInput = new Mouse3DInput(this);
     mouse = new Mouse6dofInput(mouseInput);

src/ui/PrimaryFlightDisplay.cpp

@@ -112,7 +112,7 @@
  */
 double PrimaryFlightDisplay_round(double value, int digits=0)
 {
-    return floor(value * pow(10, digits) + 0.5) / pow(10, digits);
+    return floor(value * pow(10.0, digits) + 0.5) / pow(10.0, digits);
 }
 
 const int PrimaryFlightDisplay::tickValues[] = {10, 20, 30, 45, 60};