diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-26 16:04:47 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-26 16:04:47 (GMT) |
| commit | 2e08308e49ea287a6dcb4ec257698281ac8ff0a8 (patch) | |
| tree | 331724033b4dcced4961053f2d5454748d7c3694 /tests | |
| parent | 27e403d9c6185c606980bb7881e39a2c88138a13 (diff) | |
| parent | d7616f00149a1d520f291fdb2b934bd36bbd7c90 (diff) | |
| download | Qt-2e08308e49ea287a6dcb4ec257698281ac8ff0a8.zip Qt-2e08308e49ea287a6dcb4ec257698281ac8ff0a8.tar.gz Qt-2e08308e49ea287a6dcb4ec257698281ac8ff0a8.tar.bz2 | |
Merge branch 'master' of git:qt/qt-multimedia-staging into qml
Conflicts:
configure.exe
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qmediacontent/tst_qmediacontent.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qmediacontent/tst_qmediacontent.cpp b/tests/auto/qmediacontent/tst_qmediacontent.cpp index 8987241..a0a9bdb 100644 --- a/tests/auto/qmediacontent/tst_qmediacontent.cpp +++ b/tests/auto/qmediacontent/tst_qmediacontent.cpp @@ -85,6 +85,7 @@ void tst_QMediaContent::testRequestCtor() QMediaContent media(request); + QCOMPARE(media.canonicalRequest(), request); QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov")); QCOMPARE(media.canonicalResource().request(), request); QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov")); |