History

Merge pull request #6687 from jherico/marketplace

Support the marketplace in QML

Brad Hefta-Gaub committed 10 years ago

Commit 3dfc48e2 parents fc4ece5 95c524f8 files · +126 −37Browse files

Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all

Unified · Split

interface/src/Application.cpp+1−1
@@ -4201,7 +4201,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 4200 unmodified lines
4201 scriptEngine->registerGlobalObject("ScriptDiscoveryService", this->getRunningScriptsWidget());4201 scriptEngine->registerGlobalObject("ScriptDiscoveryService", this->getRunningScriptsWidget());
4202}4202}
4203 4203
4204bool Application::canAcceptURL(const QString& urlString) {4204bool Application::canAcceptURL(const QString& urlString) const {
4205 QUrl url(urlString);4205 QUrl url(urlString);
4206 if (urlString.startsWith(HIFI_URL_SCHEME)) {4206 if (urlString.startsWith(HIFI_URL_SCHEME)) {
4207 return true;4207 return true;