Fix filter config panel in Windows

mltframework · Oct 25, 2014 · b4a6e9d · b4a6e9d
1 parent 6c437fa
commit b4a6e9d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/glwidget.cpp b/src/glwidget.cpp
@@ -622,8 +622,8 @@ void GLWidget::setCurrentFilter(QmlFilter* filter, QmlMetadata* meta)
 {
     setSource(QUrl());
     rootContext()->setContextProperty("filter", filter);
-    if (meta && QFile::exists(meta->vuiFilePath())) {
-        setSource(QUrl::fromLocalFile(meta->vuiFilePath()));
+    if (meta && QFile::exists(meta->vuiFilePath().toLocalFile())) {
+        setSource(meta->vuiFilePath());
     }
 }
 

diff --git a/src/qmltypes/qmlmetadata.cpp b/src/qmltypes/qmlmetadata.cpp
@@ -86,14 +86,14 @@ void QmlMetadata::setPath(const QDir &path)
     m_path = path;
 }
 
-QString QmlMetadata::qmlFilePath() const
+QUrl QmlMetadata::qmlFilePath() const
 {
-    return m_path.absoluteFilePath(m_qmlFileName);
+    return QUrl::fromLocalFile(m_path.absoluteFilePath(m_qmlFileName));
 }
 
-QString QmlMetadata::vuiFilePath() const
+QUrl QmlMetadata::vuiFilePath() const
 {
-    return m_path.absoluteFilePath(m_vuiFileName);
+    return QUrl::fromLocalFile(m_path.absoluteFilePath(m_vuiFileName));
 }
 
 void QmlMetadata::setIsAudio(bool isAudio)

diff --git a/src/qmltypes/qmlmetadata.h b/src/qmltypes/qmlmetadata.h
@@ -22,6 +22,7 @@
 #include <QObject>
 #include <QString>
 #include <QDir>
+#include <QUrl>
 
 class QmlMetadata : public QObject
 {
@@ -33,8 +34,8 @@ class QmlMetadata : public QObject
     Q_PROPERTY(bool needsGPU READ needsGPU WRITE setNeedsGPU)
     Q_PROPERTY(QString qml READ qmlFileName WRITE setQmlFileName)
     Q_PROPERTY(QString vui READ vuiFileName WRITE setVuiFileName)
-    Q_PROPERTY( QString qmlFilePath READ qmlFilePath )
-    Q_PROPERTY( QString vuiFilePath READ vuiFilePath )
+    Q_PROPERTY(QUrl qmlFilePath READ qmlFilePath )
+    Q_PROPERTY(QUrl vuiFilePath READ vuiFilePath )
     Q_PROPERTY(bool isAudio READ isAudio WRITE setIsAudio)
     Q_PROPERTY(bool isHidden READ isHidden WRITE setIsHidden)
     Q_PROPERTY(bool isFavorite READ isFavorite WRITE setIsFavorite)
@@ -64,8 +65,8 @@ class QmlMetadata : public QObject
     void setVuiFileName(const QString&);
     QDir path() const { return m_path; }
     void setPath(const QDir& path);
-    QString qmlFilePath() const;
-    QString vuiFilePath() const;
+    QUrl qmlFilePath() const;
+    QUrl vuiFilePath() const;
     bool isAudio() const { return m_isAudio; }
     void setIsAudio(bool isAudio);
     bool isHidden() const { return m_isHidden; }