diff options
author | Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> | 2011-06-09 16:24:01 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-05 06:49:47 +0200 |
commit | 1fa94883ed2df22f68f77992f1ef9b4e491f3764 (patch) | |
tree | 08f7003415b50f6ea5782da2f970d094a19bb063 /tests/auto | |
parent | e33b74bd7058cc640a6d5482f78eb6ba3f023660 (diff) |
QMediaPlayer autotest tests for OpenMAX AL even OpenMAX AL is not present
The test is missing #ifdef around OpenMAX AL section.
Change-Id: I0d395f8cfd72cbccf7de894dd43e64e0afbeb289
Task-number: QTMOBILITY-1657
(cherry picked from commit e6b684de322c55a75aa6d46bd6db785705775a15)
Reviewed-on: http://codereview.qt.nokia.com/977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
Diffstat (limited to 'tests/auto')
-rwxr-xr-x | tests/auto/qmediaplayer/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qmediaplayer/main.cpp b/tests/auto/qmediaplayer/main.cpp index b4dd5c470..896782eb9 100755 --- a/tests/auto/qmediaplayer/main.cpp +++ b/tests/auto/qmediaplayer/main.cpp @@ -55,6 +55,7 @@ int main(int argc, char**argv) tst_QMediaPlayer test_api; ret = QTest::qExec(&test_api, argc, argv); #ifdef Q_OS_SYMBIAN +#ifdef HAS_OPENMAXAL_MEDIAPLAY_BACKEND char *new_argv[3]; QString str = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + "_s60.log"; QByteArray bytes = str.toAscii(); @@ -64,6 +65,7 @@ int main(int argc, char**argv) new_argv[2] = bytes.data(); tst_QMediaPlayer_xa test_xa; ret = QTest::qExec(&test_xa, 3, new_argv); +#endif char *new_argv1[3]; QString str1 = "C:\\data\\" + QFileInfo(QCoreApplication::applicationFilePath()).baseName() + "_s60.log"; QByteArray bytes1 = str1.toAscii(); |