summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Treat <adam.treat@qt.io>2018-01-30 12:28:31 -0500
committerTomi Korpipää <tomi.korpipaa@qt.io>2018-02-02 09:03:28 +0000
commit4786888312f4dcb37c4884cf4f4f7291d3fec98e (patch)
tree6fe6202f57c64ff2d3e13a18ae88d64ed3d26f94 /src
parent5b64017784de460d2f128df9c730e65ee79bfeae (diff)
Fix loading of uia file settings
Add back line that was erroneously removed with fix for QT3DS-869 Change-Id: Ibdca58f34bf942860bd98a9731edadeaa865d215 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp b/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp
index 6b0e39b2..a10c5cd8 100644
--- a/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp
+++ b/src/Runtime/Source/Runtime/Source/Qt3DSApplication.cpp
@@ -1104,6 +1104,9 @@ struct SApp : public IApplication
theStateReferences = m_CoreFactory->GetVisualStateContext().PreParseDocument(inReader);
}
{
+ m_UIAFileSettings.Parse(inReader);
+ }
+ {
IDOMReader::Scope __assetsScope(inReader);
if (!inReader.MoveToFirstChild("assets")) {
qCCritical(INVALID_OPERATION,