History

Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged

Wayne Chen committed 8 years ago

Commit 0a7102b2 parents 22a9030 4d7b2bb238 files · +6811 −2259Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 238 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+2−1
@@ -135,7 +135,8 @@ void WindowScriptingInterface::openUrl(const QUrl& url) { · 134 unmodified lines
135 DependencyManager::get<AddressManager>()->handleLookupString(url.toString());135 DependencyManager::get<AddressManager>()->handleLookupString(url.toString());
136 } else {136 } else {
137#if defined(Q_OS_ANDROID)137#if defined(Q_OS_ANDROID)
138 QList<QString> args = { url.toString() };138 QMap<QString, QString> args;
139 args["url"] = url.toString();
139 AndroidHelper::instance().requestActivity("WebView", true, args);140 AndroidHelper::instance().requestActivity("WebView", true, args);
140#else141#else
141 // address manager did not handle - ask QDesktopServices to handle142 // address manager did not handle - ask QDesktopServices to handle