diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-26 11:25:36 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-26 11:52:26 +0000 |
| commit | 6d56b53bb949caa3e592070794b3010e4801e0ca (patch) | |
| tree | 7b68a96c5a43da03f9126a2d30d5c7d05fe7793b /src/render/io/scenemanager_p.h | |
| parent | e1b0e10340cf0a9c233774647cf316a7519a2093 (diff) | |
| parent | 1360f39aa811df96c2762cf081702f7a86a782cd (diff) | |
Merge branch '5.10' into dev
Change-Id: I4728b29c349a16867951a781c9417054c798e04a
Diffstat (limited to 'src/render/io/scenemanager_p.h')
| -rw-r--r-- | src/render/io/scenemanager_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h index 624b32499..470846b83 100644 --- a/src/render/io/scenemanager_p.h +++ b/src/render/io/scenemanager_p.h @@ -95,7 +95,7 @@ public: void addSceneData(const QUrl &source, Qt3DCore::QNodeId sceneUuid, const QByteArray &data = QByteArray()); - QVector<LoadSceneJobPtr> pendingSceneLoaderJobs(); + QVector<LoadSceneJobPtr> takePendingSceneLoaderJobs(); void startSceneDownload(const QUrl &source, Qt3DCore::QNodeId sceneUuid); void clearSceneDownload(SceneDownloader *downloader); |