Merge branch 'dev-mac' of github.com:pixhawk/qgroundcontrol into dev-mac

src/lib/qextserialport/qextserialport.h

-
-#ifndef _QEXTSERIALPORT_H_
-#define _QEXTSERIALPORT_H_
-
-/*POSIX CODE*/
-#ifdef _TTY_POSIX_
-#include "posix_qextserialport.h"
-#define QextBaseType Posix_QextSerialPort
-
-/*MS WINDOWS CODE*/
-#else
-#include "win_qextserialport.h"
-#define QextBaseType Win_QextSerialPort
-#endif
-
-class QextSerialPort: public QextBaseType
-{
-    Q_OBJECT
-
-public:
-    typedef QextSerialBase::QueryMode QueryMode;
-
-    QextSerialPort(QueryMode mode = QextSerialPort::EventDriven);
-    QextSerialPort(const QString & name, QueryMode mode = QextSerialPort::EventDriven);
-    QextSerialPort(PortSettings const& s, QueryMode mode = QextSerialPort::EventDriven);
-    QextSerialPort(const QString & name, PortSettings const& s, QueryMode mode = QextSerialPort::EventDriven);
-    QextSerialPort(const QextSerialPort& s);
-    QextSerialPort& operator=(const QextSerialPort&);
-    virtual ~QextSerialPort();
-
-};
-
-#endif

src/lib/qextserialport/qextserialport.pri

-QPORTDIR               = src/lib/qextserialport
-
-INCLUDEPATH             += $$QPORTDIR
-HEADERS                 += $$QPORTDIR/qextserialbase.h \
-                          $$QPORTDIR/qextserialport.h \
-                          $$QPORTDIR/qextserialenumerator.h
-SOURCES                 += $$QPORTDIR/qextserialbase.cpp \
-                          $$QPORTDIR/qextserialport.cpp \
-                          $$QPORTDIR/qextserialenumerator.cpp
-
-unix:HEADERS           += $$QPORTDIR/posix_qextserialport.h
-unix:SOURCES           += $$QPORTDIR/posix_qextserialport.cpp
-unix:DEFINES           += _TTY_POSIX_
-
-
-win32:HEADERS          += $$QPORTDIR/win_qextserialport.h
-win32:SOURCES          += $$QPORTDIR/win_qextserialport.cpp
-win32:DEFINES          += _TTY_WIN_
-
-win32:LIBS             += -lsetupapi
-
-unix:VERSION            = 1.2.0

src/libs/opmapcontrol/opmapcontrol.h

+#include "src/mapwidget/opmapwidget.h"

src/libs/opmapcontrol/opmapcontrol.pri

+LIBS *= -l$$qtLibraryTarget(opmapwidget)