修改了很多,但是还是未成功,有部分符号无法引用

This commit is contained in:
hm
2020-02-22 19:59:28 +08:00
parent 779815f080
commit 0d84fe7fbc
20 changed files with 99 additions and 25 deletions
+1 -5
View File
@@ -56,10 +56,6 @@ HEADERS += \
#!isEmpty(target.path): INSTALLS += target #!isEmpty(target.path): INSTALLS += target
#add libs
#INCLUDEPATH += $$PWD/../thirdpart/libqui/include
#LIBS += -L$$PWD/../thirdpart/libqui/lib -lQtUi
#添加程序运行的第三方库 #添加程序运行的第三方库
INCLUDEPATH += $$PWD/../thirdpart/include INCLUDEPATH += $$PWD/../thirdpart/include
@@ -79,7 +75,7 @@ OBJECTS_DIR = $$PWD/../build
#复制运行库到程序目录 #复制运行库到程序目录
win32 { win32|win64 {
src_dir = $$PWD\\..\\thirdpart\\lib\\*.dll src_dir = $$PWD\\..\\thirdpart\\lib\\*.dll
dst_dir = $$PWD\\..\\app_bin\\ dst_dir = $$PWD\\..\\app_bin\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之
+1 -1
View File
@@ -48,7 +48,7 @@ OBJECTS_DIR = $$PWD/../build
DEFINES += QtClientLink DEFINES += QtClientLink
win32 { win32|win64 {
src_dir = $$PWD\\*.h src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\ dst_dir = $$PWD\\..\\thirdpart\\include\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之
+1 -1
View File
@@ -48,7 +48,7 @@ OBJECTS_DIR = $$PWD/../build
DEFINES += QtCockpit DEFINES += QtCockpit
win32 { win32|win64 {
src_dir = $$PWD\\*.h src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\ dst_dir = $$PWD\\..\\thirdpart\\include\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之
+8 -1
View File
@@ -1,4 +1,4 @@
#ifndef LEFTLADDER_H #ifndef LEFTLADDER_H
#define LEFTLADDER_H #define LEFTLADDER_H
#include <QObject> #include <QObject>
@@ -12,8 +12,15 @@
#include "QDebug" #include "QDebug"
#include "QPicture" #include "QPicture"
#ifdef QtCockpit
#include <Cockpitglobal.h>
class COCKPITSHARED_EXPORT LeftLadder: public QWidget{
#else
class LeftLadder: public QWidget class LeftLadder: public QWidget
{ {
#endif
Q_OBJECT Q_OBJECT
public: public:
explicit LeftLadder(QWidget *parent = 0); explicit LeftLadder(QWidget *parent = 0);
+1 -1
View File
@@ -59,7 +59,7 @@ SOURCES += \
mavlinknode.cpp mavlinknode.cpp
win32 { win32|win64 {
src_dir = $$PWD\\*.h src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\ dst_dir = $$PWD\\..\\thirdpart\\include\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之
+1 -1
View File
@@ -51,7 +51,7 @@ OBJECTS_DIR = $$PWD/../build
DEFINES += QtSerialPort DEFINES += QtSerialPort
win32 { win32|win64 {
src_dir = $$PWD\\*.h src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\ dst_dir = $$PWD\\..\\thirdpart\\include\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之
+1 -1
View File
@@ -45,7 +45,7 @@ DEFINES += QtSkin
RESOURCES += \ RESOURCES += \
images.qrc images.qrc
win32 { win32|win64 {
src_dir = $$PWD\\*.h src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\ dst_dir = $$PWD\\..\\thirdpart\\include\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之
+3 -3
View File
@@ -19,8 +19,8 @@ OBJECTS_DIR = $$PWD/../../build
QT += network QT += network
QT += sql QT += sql
CONFIG += staticlib\ #CONFIG += staticlib\
plugin # plugin
SOURCES += opmaps.cpp \ SOURCES += opmaps.cpp \
pureimagecache.cpp \ pureimagecache.cpp \
@@ -73,7 +73,7 @@ INCLUDEPATH += $$PWD/../../thirdpart/include
win32 { win32|win64 {
src_dir = $$PWD\\*.h src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\..\\thirdpart\\include\\ dst_dir = $$PWD\\..\\..\\thirdpart\\include\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之
+1 -2
View File
@@ -38,10 +38,9 @@ class OPMAPCORESHARED_EXPORT MapType : public QObject {
#else #else
class MapType : public QObject { class MapType : public QObject {
#endif #endif
Q_OBJECT Q_ENUMS(Types) Q_OBJECT Q_ENUMS(Types)
public: public:
enum Types { enum Types {
GoogleMap = 1, GoogleMap = 1,
GoogleSatellite = 4, GoogleSatellite = 4,
+11 -1
View File
@@ -1,4 +1,4 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file point.h * @file point.h
@@ -31,8 +31,18 @@
#include <QString> #include <QString>
namespace core { namespace core {
#ifdef QtOpmapCore
#include <coreglobal.h>
struct OPMAPCORESHARED_EXPORT Size;
struct OPMAPCORESHARED_EXPORT Point {
#else
struct Size; struct Size;
struct Point { struct Point {
#endif
friend uint qHash(Point const & point); friend uint qHash(Point const & point);
friend bool operator==(Point const & lhs, Point const & rhs); friend bool operator==(Point const & lhs, Point const & rhs);
friend bool operator!=(Point const & lhs, Point const & rhs); friend bool operator!=(Point const & lhs, Point const & rhs);
+9
View File
@@ -58,8 +58,17 @@
#include <QObject> #include <QObject>
namespace mapcontrol { namespace mapcontrol {
#ifdef QtOpmapInternals
#include <internalglobal.h>
class OPMAPINTERNALSHARED_EXPORT OPMapControl;
class OPMAPINTERNALSHARED_EXPORT MapGraphicItem;
#else
class OPMapControl; class OPMapControl;
class MapGraphicItem; class MapGraphicItem;
#endif
} }
namespace internals { namespace internals {
+3 -3
View File
@@ -17,8 +17,8 @@ OBJECTS_DIR = $$PWD/../../build
QT += network QT += network
QT += sql QT += sql
CONFIG += staticlib\ #CONFIG += staticlib\
plugin # plugin
HEADERS += core.h \ HEADERS += core.h \
internalglobal.h \ internalglobal.h \
@@ -59,7 +59,7 @@ INCLUDEPATH += $$PWD/../../thirdpart/include
LIBS += -L$$PWD/../../thirdpart/lib -lcore LIBS += -L$$PWD/../../thirdpart/lib -lcore
win32 { win32|win64 {
src_dir = $$PWD\\*.h src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\..\\thirdpart\\include\\ dst_dir = $$PWD\\..\\..\\thirdpart\\include\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之
+8 -1
View File
@@ -1,4 +1,4 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file pointlatlng.h * @file pointlatlng.h
@@ -32,7 +32,14 @@
#include "sizelatlng.h" #include "sizelatlng.h"
namespace internals { namespace internals {
#ifdef QtOpmapInternals
#include <internalglobal.h>
struct OPMAPINTERNALSHARED_EXPORT PointLatLng {
#else
struct PointLatLng { struct PointLatLng {
#endif
// friend uint qHash(PointLatLng const& point); // friend uint qHash(PointLatLng const& point);
friend bool operator==(PointLatLng const & lhs, PointLatLng const & rhs); friend bool operator==(PointLatLng const & lhs, PointLatLng const & rhs);
friend bool operator!=(PointLatLng const & left, PointLatLng const & right); friend bool operator!=(PointLatLng const & left, PointLatLng const & right);
+9
View File
@@ -41,8 +41,17 @@
#include "trailitem.h" #include "trailitem.h"
#include "traillineitem.h" #include "traillineitem.h"
namespace mapcontrol { namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT WayPointItem;
class OPMAPWIDGETSHARED_EXPORT OPMapWidget;
#else
class WayPointItem; class WayPointItem;
class OPMapWidget; class OPMapWidget;
#endif
/** /**
* @brief A QGraphicsItem representing the UAV * @brief A QGraphicsItem representing the UAV
* *
+21 -1
View File
@@ -1,4 +1,4 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file mapgraphicitem.h * @file mapgraphicitem.h
@@ -42,14 +42,34 @@
// #include "uavitem.h" // #include "uavitem.h"
namespace mapcontrol { namespace mapcontrol {
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT WayPointItem;
class OPMAPWIDGETSHARED_EXPORT OPMapWidget;
#else
class WayPointItem; class WayPointItem;
class OPMapWidget; class OPMapWidget;
#endif
/** /**
* @brief The main graphicsItem used on the widget, contains the map and map logic * @brief The main graphicsItem used on the widget, contains the map and map logic
* *
* @class MapGraphicItem mapgraphicitem.h "mapgraphicitem.h" * @class MapGraphicItem mapgraphicitem.h "mapgraphicitem.h"
*/ */
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT MapGraphicItem : public QObject, public QGraphicsItem {
#else
class MapGraphicItem : public QObject, public QGraphicsItem { class MapGraphicItem : public QObject, public QGraphicsItem {
#endif
friend class mapcontrol::OPMapWidget; friend class mapcontrol::OPMapWidget;
Q_OBJECT Q_OBJECT
Q_INTERFACES(QGraphicsItem) Q_INTERFACES(QGraphicsItem)
+1 -1
View File
@@ -75,7 +75,7 @@ LIBS += -L$$PWD/../../thirdpart/lib -linternals
#POST_TARGETDEPS += $$PWD/../../thirdpart/lib/libinternals.a #POST_TARGETDEPS += $$PWD/../../thirdpart/lib/libinternals.a
win32 { win32|win64 {
src_dir = $$PWD\\*.h src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\..\\thirdpart\\include\\ dst_dir = $$PWD\\..\\..\\thirdpart\\include\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之
+8
View File
@@ -230,7 +230,15 @@ public:
} }
}; };
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT OPMapWidget : public QGraphicsView {
#else
class OPMapWidget : public QGraphicsView { class OPMapWidget : public QGraphicsView {
#endif
Q_OBJECT Q_OBJECT
// Q_PROPERTY(int MaxZoom READ MaxZoom WRITE SetMaxZoom) // Q_PROPERTY(int MaxZoom READ MaxZoom WRITE SetMaxZoom)
Q_PROPERTY(int MinZoom READ MinZoom WRITE SetMinZoom) Q_PROPERTY(int MinZoom READ MinZoom WRITE SetMinZoom)
+8
View File
@@ -49,7 +49,15 @@ struct distBearingAltitude {
bearing = degrees * M_PI / 180; bearing = degrees * M_PI / 180;
} }
}; };
#ifdef QtopmapWidget
#include <mapwidgetglobal.h>
class OPMAPWIDGETSHARED_EXPORT HomeItem;
#else
class HomeItem; class HomeItem;
#endif
/** /**
* @brief A QGraphicsItem representing a WayPoint * @brief A QGraphicsItem representing a WayPoint
* *
+2 -1
View File
@@ -8,7 +8,8 @@ TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
SUBDIRS += core
SUBDIRS += internals SUBDIRS += internals
SUBDIRS += core
SUBDIRS += mapwidget SUBDIRS += mapwidget
+1 -1
View File
@@ -39,7 +39,7 @@ OBJECTS_DIR = $$PWD/../build
DEFINES += QNavigation DEFINES += QNavigation
win32 { win32|win64 {
src_dir = $$PWD\\*.h src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\ dst_dir = $$PWD\\..\\thirdpart\\include\\
# dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之 # dst_dir 最后的 \\ 是必须的,用来标示 xcopy 到一个文件夹,若不存在,创建之