diff --git a/ground/src/plugins/serialconnection/serialconnection.pro b/ground/src/plugins/serialconnection/serialconnection.pro index c7921b2a2..057c1f249 100644 --- a/ground/src/plugins/serialconnection/serialconnection.pro +++ b/ground/src/plugins/serialconnection/serialconnection.pro @@ -3,10 +3,11 @@ TARGET = Serial include(../../openpilotgcsplugin.pri) include(serial_dependencies.pri) INCLUDEPATH += ../../libs/qextserialport/src -HEADERS += serialplugin.h \ - serial_global.h +HEADERS += serialplugin.h +#HEADERS += serialplugin.h \ +# serial_global.h SOURCES += serialplugin.cpp FORMS += RESOURCES += -DEFINES += SERIAL_LIBRARY +#DEFINES += SERIAL_LIBRARY OTHER_FILES += Serial.pluginspec diff --git a/ground/src/plugins/serialconnection/serialplugin.h b/ground/src/plugins/serialconnection/serialplugin.h index 115a3fdda..1ef0399c6 100644 --- a/ground/src/plugins/serialconnection/serialplugin.h +++ b/ground/src/plugins/serialconnection/serialplugin.h @@ -28,7 +28,7 @@ #ifndef SERIALPLUGIN_H #define SERIALPLUGIN_H -#include "serial_global.h" +//#include "serial_global.h" #include #include #include "coreplugin/iconnection.h" @@ -44,7 +44,8 @@ class SerialConnection; * Some operating systems do not send device insertion events so * for those we have to poll */ -class SERIAL_EXPORT SerialEnumerationThread : public QThread +//class SERIAL_EXPORT SerialEnumerationThread : public QThread +class SerialEnumerationThread : public QThread { Q_OBJECT public: @@ -67,7 +68,8 @@ protected: * Plugin will add a instance of this class to the pool, * so the connection manager can use it. */ -class SERIAL_EXPORT SerialConnection +//class SERIAL_EXPORT SerialConnection +class SerialConnection : public Core::IConnection { Q_OBJECT @@ -101,7 +103,9 @@ protected: }; -class SERIAL_EXPORT SerialPlugin + +//class SERIAL_EXPORT SerialPlugin +class SerialPlugin : public ExtensionSystem::IPlugin { Q_OBJECT