Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 07:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a couple of QML errors

Browse source
This commit is contained in:
David Rowe 2016-10-13 18:16:21 +13:00
parent a75925d1e3
commit 2343e02454
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/windows/ScrollingWindow.qml
View file

@ -133,7 +133,6 @@ Window {
// Optional non-scrolling footer. // Optional non-scrolling footer.
id: footerPane id: footerPane
// @@@@@@@ TODO: Are these aliases actually needed?
property alias keyboardOverride: window.keyboardOverride property alias keyboardOverride: window.keyboardOverride
property alias keyboardRaised: window.keyboardRaised property alias keyboardRaised: window.keyboardRaised
property alias punctuationMode: window.punctuationMode property alias punctuationMode: window.punctuationMode
@ -212,6 +211,8 @@ Window {
} }
Component.onCompleted: { Component.onCompleted: {
keyboardEnabled = HMD.active; if (typeof HMD !== "undefined") {
keyboardEnabled = HMD.active;
}
} }
} }

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

@ -309,6 +309,7 @@ void OffscreenQmlSurface::create(QOpenGLContext* shareContext) {
} }
// FIXME // FIXME
_glData = ::getGLContextData(); // Initialize JSON structure so that it can be filled in later and then used in QML.
_qmlEngine->rootContext()->setContextProperty("GL", _glData); _qmlEngine->rootContext()->setContextProperty("GL", _glData);
_qmlEngine->rootContext()->setContextProperty("offscreenWindow", QVariant::fromValue(getWindow())); _qmlEngine->rootContext()->setContextProperty("offscreenWindow", QVariant::fromValue(getWindow()));
_qmlComponent = new QQmlComponent(_qmlEngine); _qmlComponent = new QQmlComponent(_qmlEngine);