hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改环境到可以使用VS编译

Browse Source
This commit is contained in:
hm
2020-02-20 17:13:31 +08:00
parent c72eb1b6db
commit 5ae0fbc720
17 changed files with 133 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ClientLinkDialog/ClientLinkDialog.pro
+2 -1
View File
@@ -34,7 +34,8 @@ FORMS += \
$$PWD/clientlinkdialog.ui
HEADERS += \
$$PWD/clientlinkdialog.h
$$PWD/clientlinkdialog.h \
clientlinkglobal.h
SOURCES += \
$$PWD/clientlinkdialog.cpp
ClientLinkDialog/clientlinkdialog.h
+8 -1
View File
@@ -1,4 +1,4 @@
#ifndef CLIENTLINKDIALOG_H
#ifndef CLIENTLINKDIALOG_H
#define CLIENTLINKDIALOG_H
#include <QDialog>
@@ -9,8 +9,15 @@ namespace Ui {
class ClientLinkDialog;
}
#ifdef QtClientLink
#include <clientlinkglobal.h>
class CLIENTLINKSHARED_EXPORT ClientLinkDialog : public QDialog {
#else
class ClientLinkDialog : public QDialog
{
#endif
Q_OBJECT
public:
ClientLinkDialog/clientlinkglobal.h
+18
View File
@@ -0,0 +1,18 @@
#ifndef CLIENTLINKGLOBAL_H
#define CLIENTLINKGLOBAL_H
#include <QtCore/qglobal.h>
#ifdef QtClientLink
#if defined(CLIENTLINK_LIBRARY)
# define CLIENTLINKSHARED_EXPORT Q_DECL_EXPORT
#else
# define CLIENTLINKSHARED_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // CLIENTLINKGLOBAL_H
Cockpit/Cockpit.h
+7
View File
@@ -11,8 +11,15 @@
class QColor;
#ifdef QtCockpit
#include <Cockpitglobal.h>
class COCKPITSHARED_EXPORT Cockpit: public QWidget {
#else
class Cockpit: public QWidget
{
#endif
Q_OBJECT
public:
enum ErrorCode {MaxValueError=1,MinValueError,ThresholdError,TargetError,PrecisionError,ColorError,UnitsEmpty,OutOfRange};
Cockpit/Cockpit.pro
+1
View File
@@ -33,6 +33,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
HEADERS += \
$$PWD/Cockpit.h \
cockpitglobal.h \
leftladder.h
SOURCES += \
Cockpit/cockpitglobal.h
+18
View File
@@ -0,0 +1,18 @@
#ifndef COCKPITGLOBAL_H
#define COCKPITGLOBAL_H
#include <QtCore/qglobal.h>
#ifdef QtCockpit
#if defined(COCKPIT_LIBRARY)
# define COCKPITSHARED_EXPORT Q_DECL_EXPORT
#else
# define COCKPITSHARED_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // COPKITGLOBAL_H
MavLinkNode/MavLinkNode.pro
+2 -1
View File
@@ -52,7 +52,8 @@ INCLUDEPATH += $$PWD/../mavlink \
$$PWD/../mavlink/message_definitions
HEADERS += \
mavlinknode.h \
mavlinknode.h \ \
mavlinknodeglobal.h
SOURCES += \
mavlinknode.cpp
MavLinkNode/mavlinknode.h
+6 -3
View File
@@ -8,11 +8,14 @@
//#include "mavlink.h"
#ifdef QtMavlinkNode
#include <mavlinknodeglobal.h>
class MAVLINKNODESHARED_EXPORT MavLinkNode : public QObject {
#else
class MavLinkNode : public QObject
{
#endif
Q_OBJECT
public:
explicit MavLinkNode(QObject *parent = nullptr);
MavLinkNode/mavlinknodeglobal.h
+16
View File
@@ -0,0 +1,16 @@
#ifndef MAVLINKNODEGLOBAL_H
#define MAVLINKNODEGLOBAL_H
#include <QtCore/qglobal.h>
#ifdef QtMavlinkNode
#if defined(MAV_LIBRARY)
# define MAVLINKNODESHARED_EXPORT Q_DECL_EXPORT
#else
# define MAVLINKNODESHARED_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // MAVLINKNODEGLOBAL_H
SerialPortDialog/SerialPortDialog.pro
+1 -1
View File
@@ -37,7 +37,7 @@ FORMS += \
HEADERS += \
$$PWD/connectdialog.h \
$$PWD/disconnectdialog.h \
serialportlib.h
serialportglobal.h
SOURCES += \
$$PWD/connectdialog.cpp \
SerialPortDialog/connectdialog.h
+5 -3
View File
@@ -8,7 +8,6 @@
#include <QSerialPort>
#include <QSerialPortInfo>
#include <QSettings>
#include "serialportlib.h"
namespace Ui {
@@ -16,10 +15,13 @@ class ConnectDialog;
}
#ifdef QtSerialPort
#include <serialportglobal.h>
class SERIALPORTSHARED_EXPORT ConnectDialog : public QDialog {
#else
class ConnectDialog : public QDialog
{
#endif
Q_OBJECT
public:
SerialPortDialog/disconnectdialog.h
+6 -4
View File
@@ -1,18 +1,20 @@
#ifndef DISCONNECTDIALOG_H
#ifndef DISCONNECTDIALOG_H
#define DISCONNECTDIALOG_H
#include <QDialog>
#include "serialportlib.h"
namespace Ui {
class disconnectdialog;
}
#ifdef QtSerialPort
#include <serialportglobal.h>
class SERIALPORTSHARED_EXPORT disconnectdialog : public QDialog {
#else
class disconnectdialog : public QDialog
{
#endif
Q_OBJECT
public:
SerialPortDialog/serialportglobal.h
+17
View File
@@ -0,0 +1,17 @@
#ifndef SERIALPORTGLOBAL_H
#define SERIALPORTGLOBAL_H
#include <QtCore/qglobal.h>
#ifdef QtSerialPort
#if defined(SERIALPORT_LIBRARY)
# define SERIALPORTSHARED_EXPORT Q_DECL_EXPORT
#else
# define SERIALPORTSHARED_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // SERIALPORTGLOBAL_H
SerialPortDialog/serialportlib.h
-20
View File
@@ -1,20 +0,0 @@
#ifndef SERIALPORTLIB_H
#define SERIALPORTLIB_H
//这一句用于输出lib exp文件
#ifdef QtSerialPort
#if defined(SERIALPORT_LIBRARY)
# define SHARED_EXPORT Q_DECL_EXPORT
#else
# define SHARED_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // SERIALPORTLIB_H
qNavigationWidget/qnavigantionglobal.h
+18
View File
@@ -0,0 +1,18 @@
#ifndef QNAVIGANTIONGLOBAL_H
#define QNAVIGANTIONGLOBAL_H
#include <QtCore/qglobal.h>
#ifdef QNavigation
#if defined(QNAVGATION_LIBRARY)
# define QNAVGATIONSHARED_EXPORT Q_DECL_EXPORT
#else
# define QNAVGATIONSHARED_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // QNAVIGANTIONGLOBAL_H
qNavigationWidget/qnavigationwidget.h
+6
View File
@@ -4,8 +4,14 @@
#include <QWidget>
#include <QMouseEvent>
#ifdef QNavigation
#include <qnavigantionglobal.h>
class QNAVGATIONSHARED_EXPORT QNavigationWidget : public QWidget {
#else
class QNavigationWidget : public QWidget
{
#endif
Q_OBJECT
public:
qNavigationWidget/qnavigationwidget.pro
+2 -1
View File
@@ -25,7 +25,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
HEADERS += \
$$PWD/qnavigationwidget.h
$$PWD/qnavigationwidget.h \
qnavigantionglobal.h
SOURCES += \
$$PWD/qnavigationwidget.cpp