Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4

 Conflicts:
	.qmake.conf

Change-Id: Idcb35d4015f20d785263f00fe42d4839c7c4ad48

1 files changed, 12 insertions, 1 deletions

diff --git a/src/imports/scxmlstatemachine/statemachineloader.cpp b/src/imports/scxmlstatemachine/statemachineloader.cpp
index 946988f..0d28e6c 100644
--- a/src/imports/scxmlstatemachine/statemachineloader.cpp
+++ b/src/imports/scxmlstatemachine/statemachineloader.cpp
@@ -163,7 +163,18 @@ bool QScxmlStateMachineLoader::parse(const QUrl &source)
         return false;
     }
 
-    m_stateMachine = QScxmlStateMachine::fromData(&buf, source.toString());
+    QString fileName;
+    if (source.isLocalFile()) {
+        fileName = source.toLocalFile();
+    } else if (source.scheme() == QStringLiteral("qrc")) {
+        fileName = ":" + source.path();
+    } else {
+        qmlWarning(this) << QStringLiteral("%1 is neither a local nor a resource URL.")
+                            .arg(source.url())
+                         << QStringLiteral("Invoking services by relative path will not work.");
+    }
+
+    m_stateMachine = QScxmlStateMachine::fromData(&buf, fileName);
     m_stateMachine->setParent(this);
     m_implicitDataModel = m_stateMachine->dataModel();