Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 20:26:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12396 from ElderOrb/double-connection-fix

Browse source 
fix 4x 'fromQml' slots execution
This commit is contained in:
John Conklin II 2018-02-21 09:01:47 -08:00 committed by GitHub
commit 92249a2bee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/qml/src/qml/OffscreenSurface.cpp
View file

@ -331,9 +331,9 @@ void OffscreenSurface::finishQmlLoad(QQmlComponent* qmlComponent,
qmlComponent->deleteLater(); qmlComponent->deleteLater();
onItemCreated(qmlContext, newItem); onItemCreated(qmlContext, newItem);
connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
if (!rootCreated) { if (!rootCreated) {
connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
onRootCreated(); onRootCreated();
emit rootItemCreated(newItem); emit rootItemCreated(newItem);
// Call this callback after rootitem is set, otherwise VrMenu wont work // Call this callback after rootitem is set, otherwise VrMenu wont work

1
libraries/ui/src/ui/OffscreenQmlSurface.cpp
View file

@ -305,7 +305,6 @@ void OffscreenQmlSurface::onItemCreated(QQmlContext* qmlContext, QQuickItem* new
qmlContext->setContextProperty("eventBridgeWrapper", new EventBridgeWrapper(eventBridge, qmlContext)); qmlContext->setContextProperty("eventBridgeWrapper", new EventBridgeWrapper(eventBridge, qmlContext));
} }
connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
} }
void OffscreenQmlSurface::onRootCreated() { void OffscreenQmlSurface::onRootCreated() {