diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 9663d2260b87115267d2a25c1eb3bba59120c61b..5fe780edb38cd7d6f04514953ab6ab1716ccc732 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -49,7 +49,7 @@ linux-g++|linux-g++-64{ BUILDDIR = $${OUT_PWD}/build } -DESTDIR = $${TARGETDIR} + LANGUAGE = C++ OBJECTS_DIR = $${BUILDDIR}/obj diff --git a/src/ui/XbeeConfigurationWindow.cpp b/src/ui/XbeeConfigurationWindow.cpp index 6910261889697aae34cdbe57da32c851688f386b..72104bffd966b65cd69d67a0a754bf826bf202bf 100644 --- a/src/ui/XbeeConfigurationWindow.cpp +++ b/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);