1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00

Merge branch 'next' of git://git.openpilot.org/OpenPilot into next

This commit is contained in:
Alessio Morale 2014-04-01 21:42:34 +02:00
commit 8fb8c8c9ff

View File

@ -33,9 +33,10 @@
#include <QMutex>
#include <QMutexLocker>
#include "uavobjectutil_global.h"
#include "uavobject.h"
class UAVOBJECTS_EXPORT AbstractUAVObjectHelper : public QObject {
class UAVOBJECTUTIL_EXPORT AbstractUAVObjectHelper : public QObject {
Q_OBJECT
public:
explicit AbstractUAVObjectHelper(QObject *parent = 0);
@ -58,7 +59,7 @@ private:
bool m_transactionCompleted;
};
class UAVOBJECTS_EXPORT UAVObjectUpdaterHelper : public AbstractUAVObjectHelper {
class UAVOBJECTUTIL_EXPORT UAVObjectUpdaterHelper : public AbstractUAVObjectHelper {
Q_OBJECT
public:
explicit UAVObjectUpdaterHelper(QObject *parent = 0);
@ -68,7 +69,7 @@ protected:
virtual void doObjectAndWaitImpl();
};
class UAVOBJECTS_EXPORT UAVObjectRequestHelper : public AbstractUAVObjectHelper {
class UAVOBJECTUTIL_EXPORT UAVObjectRequestHelper : public AbstractUAVObjectHelper {
Q_OBJECT
public:
explicit UAVObjectRequestHelper(QObject *parent = 0);