Work again for URLs.

2 files changed, 45 insertions, 43 deletions

diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 60fa13a..73aae44 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -600,14 +600,17 @@ void QmlViewer::addLibraryPath(const QString& lib)
 
 void QmlViewer::reload()
 {
-    openQml(currentFileName);
+    openQml(canvas->url());
 }
 
 void QmlViewer::open()
 {
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), currentFileName, tr("QML Files (*.qml)"));
-    if (!fileName.isEmpty())
-        openQml(fileName);
+    QString cur = canvas->url().toLocalFile();
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), cur, tr("QML Files (*.qml)"));
+    if (!fileName.isEmpty()) {
+        QFileInfo fi(fileName);
+        openQml(QUrl::fromLocalFile(fi.absoluteFilePath()));
+    }
 }
 
 void QmlViewer::executeErrors()
@@ -615,55 +618,55 @@ void QmlViewer::executeErrors()
     if (tester) tester->executefailure();
 }
 
-void QmlViewer::openQml(const QString& fileName)
+void QmlViewer::openQml(const QUrl& url)
 {
-    setWindowTitle(tr("%1 - Qt Declarative UI Viewer").arg(fileName));
+    QString fileName = url.toLocalFile();
+    setWindowTitle(tr("%1 - Qt Declarative UI Viewer").arg(fileName.isEmpty() ? url.toString() : fileName));
 
     if (!m_script.isEmpty()) 
         tester = new QFxTester(m_script, m_scriptOptions, canvas);
 
     canvas->reset();
 
-    currentFileName = fileName;
-    QUrl url(fileName);
-    QFileInfo fi(fileName);
-    if (fi.exists()) {
-        if (fi.suffix().toLower() != QLatin1String("qml")) {
-            qWarning() << "qmlviewer cannot open non-QML file" << fileName;
-            return;
-        }
+    if (!fileName.isEmpty()) {
+        QFileInfo fi(fileName);
+        if (fi.exists()) {
+            if (fi.suffix().toLower() != QLatin1String("qml")) {
+                qWarning() << "qmlviewer cannot open non-QML file" << fileName;
+                return;
+            }
 
-        url = QUrl::fromLocalFile(fi.absoluteFilePath());
-        QmlContext *ctxt = canvas->rootContext();
-        QDir dir(fi.path()+"/dummydata", "*.qml");
-        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();
-            QmlComponent comp(canvas->engine());
-            comp.setData(data, QUrl());
-            QObject *dummyData = comp.create();
-
-            if(comp.isError()) {
-                QList<QmlError> errors = comp.errors();
-                foreach (const QmlError &error, errors) {
-                    qWarning() << error;
+            QmlContext *ctxt = canvas->rootContext();
+            QDir dir(fi.path()+"/dummydata", "*.qml");
+            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();
+                QmlComponent comp(canvas->engine());
+                comp.setData(data, QUrl());
+                QObject *dummyData = comp.create();
+
+                if(comp.isError()) {
+                    QList<QmlError> errors = comp.errors();
+                    foreach (const QmlError &error, errors) {
+                        qWarning() << error;
+                    }
+                    if (tester) tester->executefailure();
                 }
-                if (tester) tester->executefailure();
-            }
 
-            if (dummyData) {
-                qWarning() << "Loaded dummy data:" << dir.filePath(qml);
-                qml.truncate(qml.length()-4);
-                ctxt->setContextProperty(qml, dummyData);
-                dummyData->setParent(this);
+                if (dummyData) {
+                    qWarning() << "Loaded dummy data:" << dir.filePath(qml);
+                    qml.truncate(qml.length()-4);
+                    ctxt->setContextProperty(qml, dummyData);
+                    dummyData->setParent(this);
+                }
             }
+        } else {
+            qWarning() << "qmlviewer cannot find file:" << fileName;
+            return;
         }
-    } else {
-        qWarning() << "qmlviewer cannot find file:" << fileName;
-        return;
     }
 
     canvas->setUrl(url);
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index 7f9dca0..f0578eb 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -63,7 +63,7 @@ public:
 
 public slots:
     void sceneResized(QSize size);
-    void openQml(const QString& fileName);
+    void openQml(const QUrl&);
     void open();
     void reload();
     void takeSnapShot();
@@ -93,7 +93,6 @@ private:
     void setupProxy();
     QString getVideoFileName();
 
-    QString currentFileName;
     PreviewDeviceSkin *skin;
     QSize skinscreensize;
     QmlView *canvas;