diff --git a/Src/RescueLoad/RescueLoad.pri b/Src/RescueLoad/RescueLoad.pri index 56628a2..161c2c7 100644 --- a/Src/RescueLoad/RescueLoad.pri +++ b/Src/RescueLoad/RescueLoad.pri @@ -17,4 +17,10 @@ RESOURCES += \ INCLUDEPATH += $$PWD/map/tianditu/include # 指定库文件的路径 -LIBS += -L$$PWD/map/tianditu/lib -lTianDiTu +CONFIG(debug, debug|release){ + LIBS += -L$$PWD/map/tianditu/lib -lTianDiTud +} +else +{ + LIBS += -L$$PWD/map/tianditu/lib -lTianDiTu +} diff --git a/Src/RescueLoad/map/tianditu/lib/TianDiTu.lib b/Src/RescueLoad/map/tianditu/lib/TianDiTu.lib index 7c5eb12..8b81e6c 100644 Binary files a/Src/RescueLoad/map/tianditu/lib/TianDiTu.lib and b/Src/RescueLoad/map/tianditu/lib/TianDiTu.lib differ diff --git a/Src/RescueLoad/map/tianditu/lib/TianDiTud.lib b/Src/RescueLoad/map/tianditu/lib/TianDiTud.lib new file mode 100644 index 0000000..dcf6905 Binary files /dev/null and b/Src/RescueLoad/map/tianditu/lib/TianDiTud.lib differ diff --git a/Src/WebPage/cwebengineview.cpp b/Src/WebPage/cwebengineview.cpp index 7fec817..e6a9f8d 100644 --- a/Src/WebPage/cwebengineview.cpp +++ b/Src/WebPage/cwebengineview.cpp @@ -2,24 +2,24 @@ #include "CWebEngineView.h" +#include #include -CWebEngineView::CWebEngineView(QWidget* parent) - : QWebEngineView(parent) -{ -} +CWebEngineView::CWebEngineView(QWidget *parent) : QWebEngineView(parent) {} -CWebEngineView::~CWebEngineView() -{ +CWebEngineView::~CWebEngineView() { + QWebEnginePage *page = this->page(); + if (page != nullptr) { + delete page; + } } -QWebEngineView* CWebEngineView::createWindow(QWebEnginePage::WebWindowType type) -{ - if (type == QWebEnginePage::WebBrowserTab) - { - QWebEnginePage* new_page = new QWebEnginePage(this->page()->profile(), this); - this->setPage(new_page); - } - - return this; +QWebEngineView * +CWebEngineView::createWindow(QWebEnginePage::WebWindowType type) { + if (type == QWebEnginePage::WebBrowserTab) { + QWebEnginePage *new_page = + new QWebEnginePage(this->page()->profile(), this); + this->setPage(new_page); + } + return this; } diff --git a/Src/WebPage/cwebengineview.h b/Src/WebPage/cwebengineview.h index 68fa95b..d90b4be 100644 --- a/Src/WebPage/cwebengineview.h +++ b/Src/WebPage/cwebengineview.h @@ -5,17 +5,16 @@ class QWidget; -class CWebEngineView : public QWebEngineView -{ - Q_OBJECT +class CWebEngineView : public QWebEngineView { + Q_OBJECT public: - CWebEngineView(QWidget* parent = nullptr); - ~CWebEngineView(); + CWebEngineView(QWidget *parent = nullptr); + ~CWebEngineView(); protected: - // 解决错误:qt No RenderWidgetHost exists with id 10 in process 3 - virtual QWebEngineView* createWindow(QWebEnginePage::WebWindowType type); + // 解决错误:qt No RenderWidgetHost exists with id 10 in process 3 + virtual QWebEngineView *createWindow(QWebEnginePage::WebWindowType type); }; #endif // CWEBENGINEVIEW_H diff --git a/Src/WebPage/qweb.cpp b/Src/WebPage/qweb.cpp index e8e8965..15ec314 100644 --- a/Src/WebPage/qweb.cpp +++ b/Src/WebPage/qweb.cpp @@ -1,21 +1,13 @@ #include "qweb.h" #include "ui_qweb.h" -QWeb::QWeb(QWidget *parent) - : QWidget(parent) - , ui(new Ui::QWeb) -{ - ui->setupUi(this); - - mWeb = new QWebEngineView(this); - - ui->verticalLayout->addWidget(mWeb); - mWeb->load(QUrl("https://www.baidu.com")); +QWeb::QWeb(QWidget *parent) : QWidget(parent), ui(new Ui::QWeb) { + ui->setupUi(this); + mWeb = new QWebEngineView(this); + ui->verticalLayout->addWidget(mWeb); + mWeb->load(QUrl("https://www.baidu.com")); } -QWeb::~QWeb() -{ - delete ui; -} +QWeb::~QWeb() { delete ui; } diff --git a/mainwindow.cpp b/mainwindow.cpp index bce6123..bb2a8a3 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -32,7 +32,6 @@ MainWindow::MainWindow(QWidget *parent) // qDebug()<