History

Merge branch 'master' into menuFix

Dante Ruiz committed 9 years ago

Commit 63a78a72 parents 93ae93a b295a149 files · +196 −64Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 9 files). Show all

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+1−0
@@ -394,6 +394,7 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS · 393 unmodified lines
394394 }
395395
396396 if (root) {
397+ removeButtonsFromHomeScreen();
397398 QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));
398399 QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
399400 QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));