Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 02:17:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3450 from birarda/master

Browse source 
handle hifi urls emitted from DataWebDialog in Application
This commit is contained in:
Brad Hefta-Gaub 2014-09-18 13:36:37 -07:00
commit a5ea0479c1
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/ui/DataWebDialog.cpp
View file

@ -15,6 +15,8 @@
#include <LimitedNodeList.h> #include <LimitedNodeList.h>
#include <OAuthNetworkAccessManager.h> #include <OAuthNetworkAccessManager.h>
#include "Application.h"
#include "DataWebDialog.h" #include "DataWebDialog.h"
DataWebDialog::DataWebDialog() { DataWebDialog::DataWebDialog() {
@ -23,6 +25,12 @@ DataWebDialog::DataWebDialog() {
// use an OAuthNetworkAccessManager instead of regular QNetworkAccessManager so our requests are authed // use an OAuthNetworkAccessManager instead of regular QNetworkAccessManager so our requests are authed
page()->setNetworkAccessManager(OAuthNetworkAccessManager::getInstance()); page()->setNetworkAccessManager(OAuthNetworkAccessManager::getInstance());
// have the page delegate external links so they can be captured by the Application in case they are a hifi link
page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
// have the Application handle external links
connect(this, &QWebView::linkClicked, Application::getInstance(), &Application::openUrl);
} }
DataWebDialog* DataWebDialog::dialogForPath(const QString& path) { DataWebDialog* DataWebDialog::dialogForPath(const QString& path) {