History

Merge remote-tracking branch 'upstream/master' into android_goto_splash

Gabriel Calero committed 8 years ago

Commit ddbf4412 parents 085dd5a db82c4622 files · +218 −219Browse files

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

Unified · Split

interface/src/Application.cpp+3−2
@@ -6247,8 +6247,9 @@ bool Application::canAcceptURL(const QString& urlString) const { · 6246 unmodified lines
6247 6247
6248bool Application::acceptURL(const QString& urlString, bool defaultUpload) {6248bool Application::acceptURL(const QString& urlString, bool defaultUpload) {
6249 QUrl url(urlString);6249 QUrl url(urlString);
6250 if (isDomainURL(url)) {6250
6251 // this is a URL for a domain, either hifi:// or serverless - have the AddressManager handle it6251 if (url.scheme() == URL_SCHEME_HIFI) {
6252 // this is a hifi URL - have the AddressManager handle it
6252 QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",6253 QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",
6253 Qt::AutoConnection, Q_ARG(const QString&, urlString));6254 Qt::AutoConnection, Q_ARG(const QString&, urlString));
6254 return true;6255 return true;