Showing the changes to interface/src/ui/DataWebPage.cpp (1 of 37 files). Show all
Unified · Split
| @@ -34,15 +34,15 @@ void DataWebPage::javaScriptConsoleMessage(const QString& message, int lineNumbe · 33 unmodified lines | |||
| 34 | bool DataWebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, QWebPage::NavigationType type) { | 34 | bool DataWebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, QWebPage::NavigationType type) { |
| 35 | // Handle hifi:// links and links to files with particular extensions | 35 | // Handle hifi:// links and links to files with particular extensions |
| 36 | QString urlString = request.url().toString(); | 36 | QString urlString = request.url().toString(); |
| 37 | if (Application::getInstance()->canAcceptURL(urlString)) { | 37 | if (qApp->canAcceptURL(urlString)) { |
| 38 | if (Application::getInstance()->acceptURL(urlString)) { | 38 | if (qApp->acceptURL(urlString)) { |
| 39 | return false; // we handled it, so QWebPage doesn't need to handle it | 39 | return false; // we handled it, so QWebPage doesn't need to handle it |
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | // Make hyperlinks with target="_blank" open in user's Web browser | 43 | // Make hyperlinks with target="_blank" open in user's Web browser |
| 44 | if (type == QWebPage::NavigationTypeLinkClicked && frame == nullptr) { | 44 | if (type == QWebPage::NavigationTypeLinkClicked && frame == nullptr) { |
| 45 | Application::getInstance()->openUrl(request.url()); | 45 | qApp->openUrl(request.url()); |
| 46 | return false; // We handled it. | 46 | return false; // We handled it. |
| 47 | } | 47 | } |
| 48 | 48 | ||