diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-21 11:16:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 03:39:14 +0200 |
| commit | 4be55afa6c4da44bbc56122e8785a221f2fe4c4e (patch) | |
| tree | 4a079e5ab5ad47ec46d7e97b502957ee013fbdbc | |
| parent | f7d0cc81512cd0063a777c1a7311513a69e46d7e (diff) | |
| download | qtmultimedia-4be55afa6c4da44bbc56122e8785a221f2fe4c4e.tar.gz | |
Fix debug output test - type is qreal, so can be float or double.
Change-Id: Ica34e3076b186c4e4af4492722c1fe00445d3184
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
| -rw-r--r-- | tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp index cf1f0f91e..4fdf984ec 100644 --- a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp +++ b/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp @@ -1032,7 +1032,11 @@ void tst_QVideoSurfaceFormat::debugOperator() " frameWidth = QVariant(int, %6) \n" " viewport = QVariant(QRect, QRect(0,1 800x600) ) \n" " scanLineDirection = QVariant(QVideoSurfaceFormat::Direction, ) \n" +#if defined(QT_ARCH_ARM) // from qglobal.h + " frameRate = QVariant(float, %7) \n" +#else " frameRate = QVariant(double, %7) \n" +#endif " pixelAspectRatio = QVariant(QSize, QSize(320, 200) ) \n" " sizeHint = QVariant(QSize, QSize(1280, 600) ) \n" " yCbCrColorSpace = QVariant(QVideoSurfaceFormat::YCbCrColorSpace, ) ") |