From 1fa94883ed2df22f68f77992f1ef9b4e491f3764 Mon Sep 17 00:00:00 2001 From: Kalle Lehtonen Date: Thu, 9 Jun 2011 16:24:01 +1000 Subject: [PATCH] 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 Reviewed-by: Michael Goddard --- tests/auto/qmediaplayer/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/qmediaplayer/main.cpp b/tests/auto/qmediaplayer/main.cpp index b4dd5c47..896782eb 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();