Merge pull request #371 from akistanov/config

Fix for windows build

src/comm/XbeeLink.h

@@ -20,9 +20,9 @@ public:
 	~XbeeLink();
 	
 public: // virtual functions from XbeeLinkInterface
-	QString getPortName();
+	QString getPortName() const;
 	void requestReset() { }
-	int getBaudRate();
+	int getBaudRate() const;
 
 public slots: // virtual functions from XbeeLinkInterface
 	bool setPortName(QString portName);

src/ui/MainWindow.cc

@@ -719,7 +719,7 @@ void MainWindow::buildCommonWidgets()
 #endif
 
 #if (defined _MSC_VER) /*| (defined Q_OS_MAC) mac os doesn't support gearth right now */
-    if (!gEarthWidget)
+    if (!earthWidget)
     {
         earthWidget = new QGCGoogleEarthView(this);
         addToCentralStackedWidget(earthWidget,VIEW_GOOGLEEARTH, tr("Google Earth"));