diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-11 10:07:26 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-11 10:07:26 (GMT) |
| commit | 68cf12a907c4fbc918019dad2c2a845466d15a30 (patch) | |
| tree | 0adafc6d8ec233683579a66097b38116722f9f4b /tests/auto/mediaobject | |
| parent | dadb7b7ad36c43757d96b540b40cc3d81dca69d2 (diff) | |
| parent | c39436c722e778460366995877d66a8935d2d636 (diff) | |
| download | Qt-68cf12a907c4fbc918019dad2c2a845466d15a30.zip Qt-68cf12a907c4fbc918019dad2c2a845466d15a30.tar.gz Qt-68cf12a907c4fbc918019dad2c2a845466d15a30.tar.bz2 | |
Merge branch '4.5'
Conflicts:
configure
tests/auto/moc/tst_moc.cpp
Diffstat (limited to 'tests/auto/mediaobject')
| -rw-r--r-- | tests/auto/mediaobject/tst_mediaobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index f04a4d7..80a53d5 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -89,7 +89,7 @@ const qint64 SEEK_BACKWARDS = 2000; const qint64 ALLOWED_TIME_FOR_SEEKING = 1500; // 1.5s const qint64 SEEKING_TOLERANCE = 250; #else -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || defined(Q_OS_MAC) #define MEDIA_FILE "/sax.mp3" #define MEDIA_FILEPATH ":/media/sax.mp3" #else |