Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -439,7 +439,7 @@ void TabletProxy::loadQMLSource(const QVariant& path) { · 438 unmodified lines | |||
| 439 | } | 439 | } |
| 440 | } | 440 | } |
| 441 | 441 | ||
| 442 | void TabletProxy::pushOntoStack(const QVariant& path) { | 442 | bool TabletProxy::pushOntoStack(const QVariant& path) { |
| 443 | QObject* root = nullptr; | 443 | QObject* root = nullptr; |
| 444 | if (!_toolbarMode && _qmlTabletRoot) { | 444 | if (!_toolbarMode && _qmlTabletRoot) { |
| 445 | root = _qmlTabletRoot; | 445 | root = _qmlTabletRoot; |
| @@ -457,6 +457,8 @@ void TabletProxy::pushOntoStack(const QVariant& path) { · 11 unmodified lines | |||
| 457 | } else { | 457 | } else { |
| 458 | qCDebug(scriptengine) << "tablet cannot push QML because _qmlTabletRoot or _desktopWindow is null"; | 458 | qCDebug(scriptengine) << "tablet cannot push QML because _qmlTabletRoot or _desktopWindow is null"; |
| 459 | } | 459 | } |
| 460 | |||
| 461 | return root; | ||
| 460 | } | 462 | } |
| 461 | 463 | ||
| 462 | void TabletProxy::popFromStack() { | 464 | void TabletProxy::popFromStack() { |