Compare commits

...

6 Commits

@ -17,4 +17,10 @@ RESOURCES += \
INCLUDEPATH += $$PWD/map/tianditu/include 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
}

@ -2,24 +2,24 @@
#include "CWebEngineView.h" #include "CWebEngineView.h"
#include <QWebEngineHistory>
#include <QWidget> #include <QWidget>
CWebEngineView::CWebEngineView(QWidget* parent) CWebEngineView::CWebEngineView(QWidget *parent) : QWebEngineView(parent) {}
: QWebEngineView(parent)
{
}
CWebEngineView::~CWebEngineView() CWebEngineView::~CWebEngineView() {
{ QWebEnginePage *page = this->page();
if (page != nullptr) {
delete page;
}
} }
QWebEngineView* CWebEngineView::createWindow(QWebEnginePage::WebWindowType type) QWebEngineView *
{ CWebEngineView::createWindow(QWebEnginePage::WebWindowType type) {
if (type == QWebEnginePage::WebBrowserTab) if (type == QWebEnginePage::WebBrowserTab) {
{ QWebEnginePage *new_page =
QWebEnginePage* new_page = 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,17 +5,16 @@
class QWidget; class QWidget;
class CWebEngineView : public QWebEngineView class CWebEngineView : public QWebEngineView {
{ Q_OBJECT
Q_OBJECT
public: public:
CWebEngineView(QWidget* parent = nullptr); CWebEngineView(QWidget *parent = nullptr);
~CWebEngineView(); ~CWebEngineView();
protected: protected:
// 解决错误qt No RenderWidgetHost exists with id 10 in process 3 // 解决错误qt No RenderWidgetHost exists with id 10 in process 3
virtual QWebEngineView* createWindow(QWebEnginePage::WebWindowType type); virtual QWebEngineView *createWindow(QWebEnginePage::WebWindowType type);
}; };
#endif // CWEBENGINEVIEW_H #endif // CWEBENGINEVIEW_H

@ -1,21 +1,13 @@
#include "qweb.h" #include "qweb.h"
#include "ui_qweb.h" #include "ui_qweb.h"
QWeb::QWeb(QWidget *parent) QWeb::QWeb(QWidget *parent) : QWidget(parent), ui(new Ui::QWeb) {
: QWidget(parent) ui->setupUi(this);
, ui(new Ui::QWeb)
{
ui->setupUi(this);
mWeb = new QWebEngineView(this);
ui->verticalLayout->addWidget(mWeb);
mWeb->load(QUrl("https://www.baidu.com"));
mWeb = new QWebEngineView(this);
ui->verticalLayout->addWidget(mWeb);
mWeb->load(QUrl("https://www.baidu.com"));
} }
QWeb::~QWeb() QWeb::~QWeb() { delete ui; }
{
delete ui;
}

@ -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,11 +44,14 @@ 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 ui; delete mWeb;
delete lLinkWeb;
delete adHocNetworkWeb;
delete satelliteCommWeb;
if (m_ModelCameraDlg != nullptr) if (m_ModelCameraDlg != nullptr)
delete m_ModelCameraDlg; delete m_ModelCameraDlg;
delete ui;
} }
/** /**
* @brief MainWindow::initFile .ini * @brief MainWindow::initFile .ini

@ -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