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

Fix QML debug info: print last QML loaded file instead of Desktop.qml

Browse source
This commit is contained in:
Gabriel Calero 2018-03-02 18:04:36 -03:00
parent d64a6ecda7
commit 01699e26a5
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/ui/src/OffscreenUi.cpp
View file

@ -658,10 +658,8 @@ void OffscreenUi::createDesktop(const QUrl& url) {
#ifdef DEBUG #ifdef DEBUG
getSurfaceContext()->setContextProperty("DebugQML", QVariant(true)); getSurfaceContext()->setContextProperty("DebugQML", QVariant(true));
getSurfaceContext()->setContextProperty("DebugQMLFile", QVariant(url.toString())); #else
#else
getSurfaceContext()->setContextProperty("DebugQML", QVariant(false)); getSurfaceContext()->setContextProperty("DebugQML", QVariant(false));
getSurfaceContext()->setContextProperty("DebugQMLFile", QVariant(""));
#endif #endif
load(url, [=](QQmlContext* context, QObject* newObject) { load(url, [=](QQmlContext* context, QObject* newObject) {

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

@ -909,6 +909,12 @@ void OffscreenQmlSurface::loadInternal(const QUrl& qmlSource, bool createNewCont
finalQmlSource = _qmlContext->resolvedUrl(qmlSource); finalQmlSource = _qmlContext->resolvedUrl(qmlSource);
} }
#ifdef DEBUG
getSurfaceContext()->setContextProperty("DebugQMLFile", QVariant(finalQmlSource.toString()));
#else
getSurfaceContext()->setContextProperty("DebugQMLFile", QVariant(""));
#endif
auto targetContext = contextForUrl(finalQmlSource, parent, createNewContext); auto targetContext = contextForUrl(finalQmlSource, parent, createNewContext);
auto qmlComponent = new QQmlComponent(_qmlContext->engine(), finalQmlSource, QQmlComponent::PreferSynchronous); auto qmlComponent = new QQmlComponent(_qmlContext->engine(), finalQmlSource, QQmlComponent::PreferSynchronous);
if (qmlComponent->isLoading()) { if (qmlComponent->isLoading()) {