From ccc41383044f192353d035dd9b94d2b62b0e52ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@digia.com>
Date: Wed, 12 Jun 2013 17:49:08 +0200
Subject: [PATCH] Fix for url bug in the qmlvideo examples.
In the FileBrowser paths where being prepended with file:///, since all
the paths already starts with a forward slash, navigating away from the
initial directory was therefore not possible.
To make the examples work on Android, QT += multimedia was added.
Change-Id: Iff96729d476c4292999b022bdd6d5770b6b011e7
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
examples/multimedia/video/qmlvideo/main.cpp | 4 ++--
.../multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml | 2 +-
examples/multimedia/video/qmlvideo/qmlvideo.pro | 2 +-
examples/multimedia/video/qmlvideofx/main.cpp | 6 +++---
.../video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml | 2 +-
examples/multimedia/video/qmlvideofx/qmlvideofx.pro | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp
index e44476a15..81c38d240 100644
--- a/examples/multimedia/video/qmlvideo/main.cpp
+++ b/examples/multimedia/video/qmlvideo/main.cpp
@@ -132,10 +132,10 @@ int main(int argc, char *argv[])
QUrl videoPath;
const QStringList moviesLocation = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation);
if (moviesLocation.isEmpty()) {
- QUrl appPath(QString("file:///%1").arg(app.applicationDirPath()));
+ QUrl appPath(QString("file://%1").arg(app.applicationDirPath()));
videoPath = appPath.resolved(QUrl("./"));
} else
- videoPath = QString("file:///%1").arg(moviesLocation.first());
+ 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 04f1092f4..18b7b0e09 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
@@ -101,7 +101,7 @@ Rectangle {
Rectangle {
id: wrapper
function launch() {
- var path = "file:///" + filePath;
+ var path = "file://" + filePath;
if (folders.isFolder(index))
down(path);
else
diff --git a/examples/multimedia/video/qmlvideo/qmlvideo.pro b/examples/multimedia/video/qmlvideo/qmlvideo.pro
index 3ea513d3a..26865c59a 100644
--- a/examples/multimedia/video/qmlvideo/qmlvideo.pro
+++ b/examples/multimedia/video/qmlvideo/qmlvideo.pro
@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = qmlvideo
-QT += quick
+QT += quick multimedia
LOCAL_SOURCES = main.cpp
LOCAL_HEADERS = trace.h
diff --git a/examples/multimedia/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp
index ab613daa8..b0698e236 100644
--- a/examples/multimedia/video/qmlvideofx/main.cpp
+++ b/examples/multimedia/video/qmlvideofx/main.cpp
@@ -116,13 +116,13 @@ int main(int argc, char *argv[])
FileReader fileReader;
viewer.rootContext()->setContextProperty("fileReader", &fileReader);
- QUrl appPath(QString("file:///%1").arg(app.applicationDirPath()));
+ QUrl appPath(QString("file://%1").arg(app.applicationDirPath()));
QUrl imagePath;
const QStringList picturesLocation = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
if (picturesLocation.isEmpty())
imagePath = appPath.resolved(QUrl("images"));
else
- imagePath = QString("file:///%1").arg(picturesLocation.first());
+ imagePath = QString("file://%1").arg(picturesLocation.first());
viewer.rootContext()->setContextProperty("imagePath", imagePath);
QUrl videoPath;
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
if (moviesLocation.isEmpty())
videoPath = appPath.resolved(QUrl("./"));
else
- videoPath = QString("file:///%1").arg(moviesLocation.first());
+ videoPath = QString("file://%1").arg(moviesLocation.first());
viewer.rootContext()->setContextProperty("videoPath", videoPath);
viewer.setTitle("qmlvideofx");
diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
index c089f6b1b..3d4343c25 100644
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
@@ -102,7 +102,7 @@ Rectangle {
Rectangle {
id: wrapper
function launch() {
- var path = "file:///" + filePath
+ var path = "file://" + filePath
if (folders.isFolder(index))
down(path);
else
diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro
index d62ade86d..563444903 100644
--- a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro
+++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro
@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = qmlvideofx
-QT += quick
+QT += quick multimedia
SOURCES += filereader.cpp main.cpp
HEADERS += filereader.h trace.h
--
GitLab