History

merge from upstream

Seth Alves committed 9 years ago

Commit 43e1cec2 parents 7154939 3c6282686 files · +4413 −1668Browse files

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

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+1−1
@@ -251,7 +251,7 @@ static QString getUsername() { · 250 unmodified lines
251}251}
252 252
253void TabletProxy::initialScreen(const QVariant& url) {253void TabletProxy::initialScreen(const QVariant& url) {
254 if (getQmlTablet()) {254 if (_qmlTabletRoot) {
255 pushOntoStack(url);255 pushOntoStack(url);
256 } else {256 } else {
257 _initialScreen = true;257 _initialScreen = true;