diff options
-rw-r--r-- | tools/qml/main.cpp | 14 | ||||
-rw-r--r-- | tools/qmlscene/main.cpp | 6 |
2 files changed, 6 insertions, 14 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 08095962be..3fa36ad8f7 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -351,11 +351,7 @@ static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory) QStringList list = dir.entryList(); for (int i = 0; i < list.size(); ++i) { QString qml = list.at(i); - QFile f(dir.filePath(qml)); - f.open(QIODevice::ReadOnly); - QByteArray data = f.readAll(); - QQmlComponent comp(&engine); - comp.setData(data, QUrl()); + QQmlComponent comp(&engine, dir.filePath(qml)); QObject *dummyData = comp.create(); if (comp.isError()) { @@ -500,6 +496,10 @@ int main(int argc, char *argv[]) //Load files LoadWatcher lw(&e, files.count()); + // Load dummy data before loading QML-files + if (!dummyDir.isEmpty() && QFileInfo (dummyDir).isDir()) + loadDummyDataFiles(e, dummyDir); + foreach (const QString &path, files) { //QUrl::fromUserInput doesn't treat no scheme as relative file paths QRegularExpression urlRe("[[:word:]]+://.*"); @@ -523,10 +523,6 @@ int main(int argc, char *argv[]) } } - - if (!dummyDir.isEmpty() && QFileInfo (dummyDir).isDir()) - loadDummyDataFiles(e, dummyDir); - return app->exec(); } diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index fcf89afb9f..531c894ada 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -323,11 +323,7 @@ static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory) QStringList list = dir.entryList(); for (int i = 0; i < list.size(); ++i) { QString qml = list.at(i); - QFile f(dir.filePath(qml)); - f.open(QIODevice::ReadOnly); - QByteArray data = f.readAll(); - QQmlComponent comp(&engine); - comp.setData(data, QUrl()); + QQmlComponent comp(&engine, dir.filePath(qml)); QObject *dummyData = comp.create(); if(comp.isError()) { |