IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-09-03 20:52:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use QtWebEngine with Qt5.5+ instead of QtWebKit. Fixes #1375, fixes #1641,

Browse Source 
fixes #1916, fixes #1815, fixes #1332
This commit is contained in:
Neel Patel
2016-11-08 10:57:42 +00:00
committed by Dave Page
parent 7da3ece169
commit 6e5683064e
6 changed files with 341 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/TabWindow.cpp
+8 -1
View File
@@ -14,7 +14,11 @@
// App headers
#include "TabWindow.h"
#if QT_VERSION >= 0x050500
#include <QWebEngineHistory>
#else
#include <QWebHistory>
#endif
TabWindow::TabWindow(QWidget *parent) :
QTabWidget(parent)
@@ -73,6 +77,7 @@ TabWindow::TabWindow(QWidget *parent) :
void TabWindow::enableDisableToolButton(const int &index)
{
QToolButton *toolBtnPtr = NULL;
WebViewWindow *tmpwebviewPtr = NULL;
WebViewWindow *webviewPtr = NULL;
// Enable/disable the toolbutton based on the history
@@ -83,7 +88,9 @@ void TabWindow::enableDisableToolButton(const int &index)
foreach( QWidget* widgetPtr, widgetList )
{
if (widgetPtr != NULL)
webviewPtr = dynamic_cast<WebViewWindow*>(widgetPtr);
tmpwebviewPtr = dynamic_cast<WebViewWindow*>(widgetPtr);
if (tmpwebviewPtr != NULL)
webviewPtr = tmpwebviewPtr;
}
}