Showing the changes to interface/src/Application.cpp (1 of 28 files). Show all
Unified · Split
| @@ -3293,9 +3293,9 @@ void Application::initializeUi() { · 3292 unmodified lines | |||
| 3293 | { | 3293 | { |
| 3294 | auto defaultUrlValidator = OffscreenQmlSurface::getUrlValidator(); | 3294 | auto defaultUrlValidator = OffscreenQmlSurface::getUrlValidator(); |
| 3295 | auto newValidator = [=](const QUrl& url) -> bool { | 3295 | auto newValidator = [=](const QUrl& url) -> bool { |
| 3296 | QString whitelistPrefix = "[WHITELIST ENTITY SCRIPTS]"; | 3296 | QString allowlistPrefix = "[ALLOWLIST ENTITY SCRIPTS]"; |
| 3297 | QList<QString> safeURLS = { "" }; | 3297 | QList<QString> safeURLS = { "" }; |
| 3298 | safeURLS += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), Qt::SkipEmptyParts); | 3298 | safeURLS += qEnvironmentVariable("EXTRA_ALLOWLIST").trimmed().split(QRegExp("\\s*,\\s*"), Qt::SkipEmptyParts); |
| 3299 | 3299 | ||
| 3300 | // PULL SAFEURLS FROM INTERFACE.JSON Settings | 3300 | // PULL SAFEURLS FROM INTERFACE.JSON Settings |
| 3301 | 3301 | ||
| @@ -3332,7 +3332,7 @@ void Application::initializeUi() { · 30 unmodified lines | |||
| 3332 | QmlContextCallback platformInfoCallback = [](QQmlContext* context) { | 3332 | QmlContextCallback platformInfoCallback = [](QQmlContext* context) { |
| 3333 | context->setContextProperty("PlatformInfo", new PlatformInfoScriptingInterface()); | 3333 | context->setContextProperty("PlatformInfo", new PlatformInfoScriptingInterface()); |
| 3334 | }; | 3334 | }; |
| 3335 | OffscreenQmlSurface::addWhitelistContextHandler({ | 3335 | OffscreenQmlSurface::addAllowlistContextHandler({ |
| 3336 | QUrl{ "hifi/tablet/TabletAddressDialog.qml" }, | 3336 | QUrl{ "hifi/tablet/TabletAddressDialog.qml" }, |
| 3337 | QUrl{ "hifi/Card.qml" }, | 3337 | QUrl{ "hifi/Card.qml" }, |
| 3338 | QUrl{ "hifi/Pal.qml" }, | 3338 | QUrl{ "hifi/Pal.qml" }, |
| @@ -3342,7 +3342,7 @@ void Application::initializeUi() { · 3 unmodified lines | |||
| 3342 | QmlContextCallback ttsCallback = [](QQmlContext* context) { | 3342 | QmlContextCallback ttsCallback = [](QQmlContext* context) { |
| 3343 | context->setContextProperty("TextToSpeech", DependencyManager::get<TTSScriptingInterface>().data()); | 3343 | context->setContextProperty("TextToSpeech", DependencyManager::get<TTSScriptingInterface>().data()); |
| 3344 | }; | 3344 | }; |
| 3345 | OffscreenQmlSurface::addWhitelistContextHandler({ | 3345 | OffscreenQmlSurface::addAllowlistContextHandler({ |
| 3346 | QUrl{ "hifi/tts/TTS.qml" } | 3346 | QUrl{ "hifi/tts/TTS.qml" } |
| 3347 | }, ttsCallback); | 3347 | }, ttsCallback); |
| 3348 | qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem"); | 3348 | qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem"); |