Commit baca1f38 authored by Lorenz Meier's avatar Lorenz Meier

Merge pull request #371 from akistanov/config

Fix for windows build
parents cb3618b8 46b5453c
......@@ -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);
......
......@@ -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"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment