slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove a few more obsolete parts.

Browse Source 
Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-07-19 10:40:05 +10:00
committed by Qt by Nokia
parent 1403a1c7be
commit eccb43d73c
100 changed files with 50 additions and 8051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/qmediaplaylist/qmediaplaylist.pro
View File

@@ -8,17 +8,7 @@ QT += multimediakit-private
# TARGET = tst_qmediaplaylist
# CONFIG += testcase
symbian*: {
PLAYLIST_TESTDATA.sources = testdata/*
PLAYLIST_TESTDATA.path = testdata
DEPLOYMENT += PLAYLIST_TESTDATA
}
wince* {
DEFINES+= TESTDATA_DIR=\\\"./\\\"
}else:!symbian {
DEFINES += TESTDATA_DIR=\\\"$$PWD/\\\"
}
DEFINES += TESTDATA_DIR=\\\"$$PWD/\\\"
HEADERS += \
$$QT.multimediakit.sources/../plugins/m3u/qm3uhandler.h

8
tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp
View File

@@ -454,20 +454,12 @@ void tst_QMediaPlaylist::saveAndLoad()
QCOMPARE(playlist.media(0), playlist2.media(0));
QCOMPARE(playlist.media(1), playlist2.media(1));
QCOMPARE(playlist.media(3), playlist2.media(3));
#ifdef Q_OS_SYMBIAN
res = playlist.save(QUrl(QLatin1String("file:///c:/data/test_m3u.m3u")), "m3u");
#else
res = playlist.save(QUrl(QLatin1String("tmp.m3u")), "m3u");
#endif
QVERIFY(res);
playlist2.clear();
QVERIFY(playlist2.isEmpty());
#ifdef Q_OS_SYMBIAN
playlist2.load(QUrl(QLatin1String("file:///c:/data/test_m3u.m3u")), "m3u");
#else
playlist2.load(QUrl(QLatin1String("tmp.m3u")), "m3u");
#endif
QCOMPARE(playlist.error(), QMediaPlaylist::NoError);
QCOMPARE(playlist.mediaCount(), playlist2.mediaCount());