Merge pull request #3018 from lilyinstarlight/misc-qt-fixes

GUI - miscellaneous Qt Tau/PhX widget fixes

Author: samaaron

app/gui/qt/CMakeLists.txt

@@ -44,6 +44,9 @@ if(Qt6_FOUND AND WITH_QT_GUI_WEBENGINE)
   add_compile_definitions(WITH_WEBENGINE)
 elseif(Qt6_FOUND)
   find_package(Qt6 COMPONENTS Core Widgets Gui Concurrent Network OpenGLWidgets PrintSupport Xml Svg REQUIRED)
+elseif(WITH_QT_GUI_WEBENGINE)
+  find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg WebEngineWidgets REQUIRED)
+  add_compile_definitions(WITH_WEBENGINE)
 else()
   find_package(Qt5 COMPONENTS Core Widgets Gui Concurrent Network OpenGL PrintSupport Xml Svg REQUIRED)
 endif()
@@ -97,7 +100,7 @@ set(SOURCES
     ${QTAPP_ROOT}/model/settings.h
     )
 
-  if(Qt6_FOUND AND WITH_QT_GUI_WEBENGINE)
+  if(WITH_QT_GUI_WEBENGINE)
     set(SOURCES
       ${SOURCES}
       ${QTAPP_ROOT}/widgets/phxwebview.h

app/gui/qt/widgets/phxwebview.cpp

@@ -17,8 +17,10 @@
 PhxWebView::PhxWebView(QWidget *parent)
     : QWebEngineView(parent)
 {
-    phxProfile = new QWebEngineProfile(this);
-    phxPage = new QWebEnginePage(phxProfile, this);
+    phxProfile = new QWebEngineProfile();
+    phxPage = new QWebEnginePage(phxProfile);
+    phxPage->setParent(this);
+    phxProfile->setParent(this);
     setPage(phxPage);
     setContextMenuPolicy(Qt::NoContextMenu);
     setZoomFactor(2.0);

app/gui/qt/widgets/phxwidget.cpp

@@ -32,7 +32,7 @@ PhxWidget::PhxWidget(QWidget *parent)
   phxView->setSizePolicy(sp_retain);
   phxView->hide();
   mainLayout = new QHBoxLayout(this);
-  topRowSubLayout = new QVBoxLayout(this);
+  topRowSubLayout = new QVBoxLayout();
   sizeDownButton = new QPushButton("-");
   sizeUpButton = new QPushButton("+");
   openExternalBrowserButton = new QPushButton(" E ");
@@ -51,7 +51,6 @@ PhxWidget::PhxWidget(QWidget *parent)
   mainLayout->addWidget(phxView, 1);
   mainLayout->addLayout(topRowSubLayout);
 
-
   connect(sizeDownButton, &QPushButton::released, this, &PhxWidget::handleSizeDown);
   connect(sizeUpButton, &QPushButton::released, this, &PhxWidget::handleSizeUp);
   connect(openExternalBrowserButton, &QPushButton::released, this, &PhxWidget::handleOpenExternalBrowser);