diff options
| author | sanevala <samuel.nevala@digia.com> | 2013-02-12 12:02:46 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-19 13:50:13 +0100 |
| commit | 73859f6ec3d6dade4f375b68db3af8bb39b62496 (patch) | |
| tree | bdd29339997bdccef79ef237c677d67dd233a25e /examples/multimedia | |
| parent | c64db5dfdecb64f4e9b3826da9ddb1dfdfdadc42 (diff) | |
User is not able to select file from FileBrowser and play it.
When string is converted to Url qrc:// scheme is used.
Fix Filebrowser to use file:// scheme instead.
Change-Id: I9617d9503ed403de7d017b8586ae37b05dc096cb
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'examples/multimedia')
| -rw-r--r-- | examples/multimedia/video/qmlvideo/main.cpp | 9 | ||||
| -rw-r--r-- | examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp index e595e4fc8..1a9c52391 100644 --- a/examples/multimedia/video/qmlvideo/main.cpp +++ b/examples/multimedia/video/qmlvideo/main.cpp @@ -127,10 +127,13 @@ int main(int argc, char *argv[]) rootObject, SLOT(qmlFramePainted())); #endif - QString videoPath; + QUrl videoPath; const QStringList moviesLocation = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation); - if (!moviesLocation.isEmpty()) - videoPath = moviesLocation.first(); + if (moviesLocation.isEmpty()) { + QUrl appPath(QString("file:///%1").arg(app.applicationDirPath())); + videoPath = appPath.resolved(QUrl("./")); + } else + videoPath = QString("file:///%1").arg(moviesLocation.first()); viewer.rootContext()->setContextProperty("videoPath", videoPath); QMetaObject::invokeMethod(rootObject, "init"); diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml index 48b538bba..d0e69424d 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml @@ -100,10 +100,11 @@ Rectangle { Rectangle { id: wrapper function launch() { + var path = "file:///" + filePath; if (folders.isFolder(index)) - down(filePath); + down(path); else - fileBrowser.selectFile(filePath) + fileBrowser.selectFile(path) } width: root.width height: 52 |