fix: 修复三方库版本不同导致的编译错误问题

pull/7/head
cbwu 7 months ago
parent 0e2f84924c
commit 4273feac19

@ -17,4 +17,10 @@ RESOURCES += \
INCLUDEPATH += $$PWD/map/tianditu/include INCLUDEPATH += $$PWD/map/tianditu/include
# 指定库文件的路径 # 指定库文件的路径
CONFIG(debug, debug|release){
LIBS += -L$$PWD/map/tianditu/lib -lTianDiTud
}
else
{
LIBS += -L$$PWD/map/tianditu/lib -lTianDiTu LIBS += -L$$PWD/map/tianditu/lib -lTianDiTu
}

@ -2,6 +2,7 @@
#include "CWebEngineView.h" #include "CWebEngineView.h"
#include <QWebEngineHistory>
#include <QWidget> #include <QWidget>
CWebEngineView::CWebEngineView(QWidget *parent) : QWebEngineView(parent) {} CWebEngineView::CWebEngineView(QWidget *parent) : QWebEngineView(parent) {}
@ -20,6 +21,5 @@ CWebEngineView::createWindow(QWebEnginePage::WebWindowType type) {
new QWebEnginePage(this->page()->profile(), this); new QWebEnginePage(this->page()->profile(), this);
this->setPage(new_page); this->setPage(new_page);
} }
return this; return this;
} }

@ -5,8 +5,7 @@
class QWidget; class QWidget;
class CWebEngineView : public QWebEngineView class CWebEngineView : public QWebEngineView {
{
Q_OBJECT Q_OBJECT
public: public:

@ -32,7 +32,6 @@ MainWindow::MainWindow(QWidget *parent)
// qDebug()<<style; // qDebug()<<style;
file.close(); file.close();
} else { } else {
qDebug() << "Open file fail " << Qt::endl; qDebug() << "Open file fail " << Qt::endl;
} }
@ -45,8 +44,8 @@ MainWindow::~MainWindow() {
delete m_SDFPDlg; delete m_SDFPDlg;
delete m_GDDCdlg; delete m_GDDCdlg;
delete m_HomePagedlg; delete m_HomePagedlg;
delete mWeb;
delete process; delete process;
delete mWeb;
delete lLinkWeb; delete lLinkWeb;
delete adHocNetworkWeb; delete adHocNetworkWeb;
delete satelliteCommWeb; delete satelliteCommWeb;

@ -59,7 +59,7 @@ QComboBox:hover
QComboBox:on QComboBox:on
{ {
border-radius:3px; border-radius:3px;
background-color:rgba(35,35,35); background-color:rgba(35,35,35,100);
font: 75 10pt "微软雅黑"; font: 75 10pt "微软雅黑";
color:rgb(255,255,255); color:rgb(255,255,255);
border:1px solid rgb(31,156,220) ; border:1px solid rgb(31,156,220) ;

Loading…
Cancel
Save