Browse Source

Remove QSerialPortInfo from mobile build

This is needed for firmware upgrade which is not part of mobile
QGC4.4
Don Gagne 10 years ago
parent
commit
9d14d9c721
  1. 6
      src/main.cc

6
src/main.cc

@ -30,7 +30,9 @@ This file is part of the QGROUNDCONTROL project
#include <QApplication> #include <QApplication>
#include <QSslSocket> #include <QSslSocket>
#ifndef __mobile__
#include <QSerialPortInfo> #include <QSerialPortInfo>
#endif
#include "QGCApplication.h" #include "QGCApplication.h"
#include "MainWindow.h" #include "MainWindow.h"
@ -50,7 +52,9 @@ This file is part of the QGROUNDCONTROL project
#undef main #undef main
#endif #endif
#ifndef __mobile__
Q_DECLARE_METATYPE(QSerialPortInfo) Q_DECLARE_METATYPE(QSerialPortInfo)
#endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
@ -109,7 +113,9 @@ int main(int argc, char *argv[])
qRegisterMetaType<QSerialPort::SerialPortError>(); qRegisterMetaType<QSerialPort::SerialPortError>();
#endif #endif
qRegisterMetaType<QAbstractSocket::SocketError>(); qRegisterMetaType<QAbstractSocket::SocketError>();
#ifndef __mobile__
qRegisterMetaType<QSerialPortInfo>(); qRegisterMetaType<QSerialPortInfo>();
#endif
// We statically link to the google QtLocation plugin // We statically link to the google QtLocation plugin

Loading…
Cancel
Save