IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

While building runtime with QtWebEngine, we found 2 compilation errors which were introduced in a previous commit in runtime:

Browse Source 
We set "setNetworkAccessManager" in WebEnginePage which was only required for Webkit so removed that statement.
"triggerAction" on WebPage is only required for Qt > 5 with WebKit only. Not required for WebEngine so added that condition.
This commit is contained in:
Neel Patel 2017-05-15 11:29:14 +01:00 committed by Dave Page
parent 2ad14b379e
commit 07b06348ab
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/BrowserWindow.cpp
View File

@ -76,7 +76,6 @@ BrowserWindow::BrowserWindow(QString url)
#ifdef PGADMIN4_USE_WEBENGINE
m_mainWebView->setPage(new WebEnginePage());
m_mainWebView->page()->setNetworkAccessManager(m_netAccessMan);
#else
m_cookieJar = new QNetworkCookieJar();
m_netAccessMan = new QNetworkAccessManager();
@ -843,7 +842,9 @@ void BrowserWindow::closetabs()
* it will be backward webkit version compatible.
*/
#if QT_VERSION >= 0x050000
#ifndef PGADMIN4_USE_WEBENGINE
webviewPtr->page()->triggerAction(static_cast<QWebPage::WebAction>(QWebPage::ToggleVideoFullscreen + 1));
#endif
#endif
}
}