"qserialport.h" is now <QSerialPort>

src/comm/SerialLink.cc

@@ -12,8 +12,8 @@
 #include <QDebug>
 #include <QSettings>
 #include <QMutexLocker>
-#include <qserialport.h>
-#include <qserialportinfo.h>
+#include <QSerialPort>
+#include <QSerialPortInfo>
 #include "SerialLink.h"
 #include "LinkManager.h"
 #include "QGC.h"
@@ -771,7 +771,7 @@ bool SerialLink::setPortName(QString portName)
 bool SerialLink::setBaudRateType(int rateIndex)
 {
 
-  // These minimum and maximum baud rates were based on those enumerated in qserialport.h
+  // These minimum and maximum baud rates were based on those enumerated in <QSerialPort>
     bool result;
     const int minBaud = (int)QSerialPort::Baud1200;
     const int maxBaud = (int)QSerialPort::Baud115200;

src/comm/SerialLink.h

@@ -40,7 +40,7 @@ This file is part of the QGROUNDCONTROL project
 #include "SerialLinkInterface.h"
 
 // We use QSerialPort::SerialPortError in a signal so we must declare it as a meta type
-#include <qserialport.h>
+#include <QSerialPort>
 #include <QMetaType>
 Q_DECLARE_METATYPE(QSerialPort::SerialPortError)
 

src/ui/configuration/ApmFirmwareConfig.cc

@@ -2,8 +2,8 @@
 
 #include "LinkManager.h"
 #include "LinkInterface.h"
-#include "qserialport.h"
-#include "qserialportinfo.h"
+#include <QSerialPort>
+#include <QSerialPortInfo>
 #include "SerialLink.h"
 
 #include "ApmFirmwareConfig.h"

src/ui/configuration/ApmFirmwareConfig.h

@@ -12,8 +12,8 @@
 #include <QMessageBox>
 #include <QProcess>
 #include <QScrollBar>
+#include <QSerialPort>
 
-#include "qserialport.h"
 #include "ui_ApmFirmwareConfig.h"
 
 class ApmFirmwareConfig : public QWidget

src/ui/configuration/SerialSettingsDialog.cc

@@ -37,8 +37,8 @@ This file is part of the APM_PLANNER project
 #include "terminalconsole.h"
 #include "ui_SerialSettingsDialog.h"
 
-#include <qserialport.h>
-#include <qserialportinfo.h>
+#include <QSerialPort>
+#include <QSerialPortInfo>
 #include <QIntValidator>
 #include <QLineEdit>
 

src/ui/configuration/SerialSettingsDialog.h

@@ -37,7 +37,7 @@ This file is part of the APM_PLANNER project
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
-#include <qserialport.h>
+#include <QSerialPort>
 
 namespace Ui {
 class SettingsDialog;

src/ui/configuration/terminalconsole.cpp

@@ -45,8 +45,8 @@ This file is part of the APM_PLANNER project
 #include <QMessageBox>
 #include <QVBoxLayout>
 #include <QComboBox>
-#include <qserialportinfo.h>
-#include <qserialport.h>
+#include <QSerialPort>
+#include <QSerialPortInfo>
 
 TerminalConsole::TerminalConsole(QWidget *parent) :
     QWidget(parent),

src/ui/configuration/terminalconsole.h

@@ -39,7 +39,7 @@ This file is part of the APM_PLANNER project
 #include "SerialSettingsDialog.h"
 
 #include <QWidget>
-#include <qserialport.h>
+#include <QSerialPort>
 
 namespace Ui {
 class TerminalConsole;