diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-25 15:01:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 09:41:39 +0100 |
| commit | 74c3a2f4f4c83b445953b3097a6509e2c217af19 (patch) | |
| tree | a5754fd65a9bbd0952aa4db71771031bd61e572f /tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp | |
| parent | e334fb649390091a3133969362aa857f36b6f632 (diff) | |
Fix warning about redefinition of M_PI in tst_qwmatrix.
Change-Id: Ib5e5fe0f087448b07adfa02984524cbb10c78395
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp')
| -rw-r--r-- | tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp index cd4f808c4e..4c73676329 100644 --- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp +++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp @@ -154,7 +154,7 @@ void tst_QWMatrix::mapping_data() << QRect( 0, 0, 30, 40 ) << QPolygon( QRect( -300, -400, 300, 400 ) ); -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) +#if (defined(Q_OS_WIN) || defined(Q_OS_WINCE)) && !defined(M_PI) #define M_PI 3.14159265897932384626433832795f #endif |