Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivate

1 files changed, 1 insertions, 9 deletions

diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index dc5bc6eaf2..15503513d0 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -275,20 +275,12 @@ void QDeclarativeWorkerScriptEnginePrivate::processMessage(int id, const QVarian
     }
 }
 
-static QString toLocalFileOrQrc(const QUrl& url)
-{
-    QString r = url.toLocalFile();
-    if (r.isEmpty() && url.scheme() == QLatin1String("qrc"))
-        r = QLatin1Char(':') + url.path();
-    return r;
-}
-
 void QDeclarativeWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
 {
     if (url.isRelative())
         return;
 
-    QString fileName = toLocalFileOrQrc(url);
+    QString fileName = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url);
 
     QFile f(fileName);
     if (f.open(QIODevice::ReadOnly)) {