diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:46:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:49:28 +0100 |
| commit | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (patch) | |
| tree | f165b7bc319548fb0082365411a871028f92e89e /tests/auto/gui/painting | |
| parent | 27b4fe96b59e9e63d1e570e802c072e9afdfb2d4 (diff) | |
| parent | 36cb3f3f655a9090c82de609010cbfb88651a0f3 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
src/gui/text/qfontdatabase.cpp
src/gui/text/qharfbuzz_copy_p.h
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qcoreapplication.cpp
Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
Diffstat (limited to 'tests/auto/gui/painting')
| -rw-r--r-- | tests/auto/gui/painting/qpainter/qpainter.pro | 1 | ||||
| -rw-r--r-- | tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/gui/painting/qpathclipper/paths.cpp | 14 | ||||
| -rw-r--r-- | tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/tests/auto/gui/painting/qpainter/qpainter.pro b/tests/auto/gui/painting/qpainter/qpainter.pro index a30564cc50..752f9be1f4 100644 --- a/tests/auto/gui/painting/qpainter/qpainter.pro +++ b/tests/auto/gui/painting/qpainter/qpainter.pro @@ -4,7 +4,6 @@ TARGET = tst_qpainter QT += testlib qtHaveModule(widgets): QT += widgets widgets-private -qtHaveModule(widgets):!wince*: QT += printsupport SOURCES += tst_qpainter.cpp diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index 774ade5fb0..6c37f1fc27 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -53,9 +53,6 @@ #include <qthread.h> #include <limits.h> #if !defined(Q_OS_WINCE) -#ifndef QT_NO_WIDGETS -#include <qprinter.h> -#endif #include <math.h> #endif #include <qpaintengine.h> diff --git a/tests/auto/gui/painting/qpathclipper/paths.cpp b/tests/auto/gui/painting/qpathclipper/paths.cpp index d7f0d6d59b..3bc2484578 100644 --- a/tests/auto/gui/painting/qpathclipper/paths.cpp +++ b/tests/auto/gui/painting/qpathclipper/paths.cpp @@ -127,7 +127,7 @@ QPainterPath Paths::body() path.cubicTo(105.28125,81.341000, 89.784000,65.812500, 70.531250,65.812500); path.lineTo(54.437500,65.812500); path.closeSubpath(); - + return path; } @@ -143,7 +143,7 @@ QPainterPath Paths::mailbox() path.lineTo(443.62570,100.11509); path.lineTo(355.22951,136.82424); path.closeSubpath(); - + return path; } @@ -271,7 +271,7 @@ QPainterPath Paths::lips() path.cubicTo(283.58862,123.78263, 270.15105,136.64382, 243.62716,155.61729); path.cubicTo(217.47805,174.32266, 199.38332,176.65905, 177.02257,176.65905); path.closeSubpath(); - + return path; } @@ -290,14 +290,14 @@ QPainterPath Paths::bezier2() QPainterPath path; path.moveTo(200,200); path.cubicTo(200,125, 500,100, 500,500); - + return path; } QPainterPath Paths::random1() { QPainterPath path; - + path.moveTo(65.714286,91.428571); path.lineTo(217.14286, 102.85714); path.cubicTo(219.04762, 106.66666, @@ -341,7 +341,7 @@ QPainterPath Paths::random1() QPainterPath Paths::random2() { QPainterPath path; - + path.moveTo(314.28571,160); path.cubicTo(434.28571,125.71429, 505.71429,200, @@ -573,7 +573,7 @@ QPainterPath Paths::triangle1() } QPainterPath Paths::triangle2() -{ +{ QPainterPath path; path.moveTo(0, 120); 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 |