From 74c3a2f4f4c83b445953b3097a6509e2c217af19 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 25 Jan 2013 15:01:19 +0100 Subject: Fix warning about redefinition of M_PI in tst_qwmatrix. Change-Id: Ib5e5fe0f087448b07adfa02984524cbb10c78395 Reviewed-by: Laszlo Papp Reviewed-by: Oliver Wolff --- tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp') 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 -- cgit v1.2.3