Merge branch 'master' of https://github.com/diydrones/apm_planner

qgroundcontrol.pro

@@ -49,7 +49,7 @@ linux-g++|linux-g++-64{
     BUILDDIR = $${OUT_PWD}/build
 }
 
-DESTDIR = $${TARGETDIR}
+
 
 LANGUAGE = C++
 OBJECTS_DIR = $${BUILDDIR}/obj

src/ui/XbeeConfigurationWindow.cpp

@@ -374,7 +374,7 @@ void XbeeConfigurationWindow::setupPortList()
 
     // Add the ports in reverse order, because we prepend them to the list
     for (int i = ports.size() - 1; i >= 0; i--) {
-        QString portString = QString(ports.at(i).portName.toLocal8Bit().constData());
+        QString portString = QString(ports.at(i).portName().toLocal8Bit().constData());
         // Prepend newly found port to the list
         if (portBox->findText(portString) == -1) {
             portBox->insertItem(0, portString);