Skip to content

Q
qgroundcontrol
Commit 9d14d9c7 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Remove QSerialPortInfo from mobile build 

This is needed for firmware upgrade which is not part of mobile
parent ff9ba294
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
src/main.cc
View file @ 9d14d9c7
...@@ -30,7 +30,9 @@ This file is part of the QGROUNDCONTROL project ...@@ -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 ...@@ -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[]) ...@@ -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
......
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