Skip to content

GUI - miscellaneous Qt Tau/PhX widget fixes #3018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2022
Merged

GUI - miscellaneous Qt Tau/PhX widget fixes #3018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af51675
Build - allow WITH_QT_GUI_WEBENGINE with Qt5
lilyinstarlight Feb 17, 2022
7811a2b
GUI - fix tau/phx widget runtime errors
lilyinstarlight Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/gui/qt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions app/gui/qt/widgets/phxwebview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions app/gui/qt/widgets/phxwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ");
Expand All @@ -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);
Expand Down