Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 16:41:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support rendering of 'about' URLs in web entities

Browse source
This commit is contained in:
Brad Davis 2018-07-30 11:56:31 -07:00
parent 8201997a16
commit c991053c93
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
View file

@ -53,7 +53,8 @@ WebEntityRenderer::ContentType WebEntityRenderer::getContentType(const QString&
} }
const QUrl url(urlString); const QUrl url(urlString);
if (url.scheme() == URL_SCHEME_HTTP || url.scheme() == URL_SCHEME_HTTPS || auto scheme = url.scheme();
if (scheme == URL_SCHEME_ABOUT || scheme == URL_SCHEME_HTTP || scheme == URL_SCHEME_HTTPS ||
urlString.toLower().endsWith(".htm") || urlString.toLower().endsWith(".html")) { urlString.toLower().endsWith(".htm") || urlString.toLower().endsWith(".html")) {
return ContentType::HtmlContent; return ContentType::HtmlContent;
} }

1
libraries/networking/src/NetworkingConstants.h
View file

@ -30,6 +30,7 @@ namespace NetworkingConstants {
QUrl METAVERSE_SERVER_URL(); QUrl METAVERSE_SERVER_URL();
} }
const QString URL_SCHEME_ABOUT = "about";
const QString URL_SCHEME_HIFI = "hifi"; const QString URL_SCHEME_HIFI = "hifi";
const QString URL_SCHEME_QRC = "qrc"; const QString URL_SCHEME_QRC = "qrc";
const QString URL_SCHEME_FILE = "file"; const QString URL_SCHEME_FILE = "file";