From 2176a4f04fb5fa100d0c013d7d8d0eb5269e1b8f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 30 Dec 2011 14:55:23 -0200 Subject: Reorganise the painting.pri file after the last round of cleanups Change-Id: I35f5356fc59d109074d39c4fafd608540743479a Reviewed-by: Gunnar Sletta --- src/gui/painting/painting.pri | 49 ++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index e4b3f5e568..6db0d341ec 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -3,11 +3,17 @@ HEADERS += \ painting/qbackingstore.h \ painting/qbezier_p.h \ + painting/qblendfunctions_p.h \ + painting/qblittable_p.h \ painting/qbrush.h \ painting/qcolor.h \ painting/qcolor_p.h \ painting/qcosmeticstroker_p.h \ + painting/qdrawhelper_p.h \ + painting/qdrawhelper_x86_p.h \ + painting/qdrawingprimitive_sse2_p.h \ painting/qemulationpaintengine_p.h \ + painting/qgrayraster_p.h \ painting/qmatrix.h \ painting/qmemrotate_p.h \ painting/qoutlinemapper_p.h \ @@ -17,6 +23,8 @@ HEADERS += \ painting/qpaintengine.h \ painting/qpaintengine_p.h \ painting/qpaintengineex_p.h \ + painting/qpaintengine_blitter_p.h \ + painting/qpaintengine_raster_p.h \ painting/qpainter.h \ painting/qpainter_p.h \ painting/qpainterpath.h \ @@ -28,6 +36,7 @@ HEADERS += \ painting/qpen.h \ painting/qpolygon.h \ painting/qpolygonclipper_p.h \ + painting/qrasterdefs_p.h \ painting/qrasterizer_p.h \ painting/qregion.h \ painting/qstroker_p.h \ @@ -42,12 +51,17 @@ SOURCES += \ painting/qbackingstore.cpp \ painting/qbezier.cpp \ painting/qblendfunctions.cpp \ + painting/qblittable.cpp \ painting/qbrush.cpp \ painting/qcolor.cpp \ painting/qcolor_p.cpp \ painting/qcosmeticstroker.cpp \ painting/qcssutil.cpp \ + painting/qdrawhelper.cpp \ painting/qemulationpaintengine.cpp \ + painting/qgammatables.cpp \ + painting/qgrayraster.c \ + painting/qimagescale.cpp \ painting/qmatrix.cpp \ painting/qmemrotate.cpp \ painting/qoutlinemapper.cpp \ @@ -55,6 +69,8 @@ SOURCES += \ painting/qpaintdevice.cpp \ painting/qpaintengine.cpp \ painting/qpaintengineex.cpp \ + painting/qpaintengine_blitter.cpp \ + painting/qpaintengine_raster.cpp \ painting/qpainter.cpp \ painting/qpainterpath.cpp \ painting/qpathclipper.cpp \ @@ -71,35 +87,10 @@ SOURCES += \ painting/qpaintbuffer.cpp \ painting/qpathsimplifier.cpp - SOURCES += \ - painting/qpaintengine_raster.cpp \ - painting/qdrawhelper.cpp \ - painting/qgammatables.cpp \ - painting/qimagescale.cpp \ - painting/qgrayraster.c \ - painting/qpaintengine_blitter.cpp \ - painting/qblittable.cpp \ - - HEADERS += \ - painting/qpaintengine_raster_p.h \ - painting/qdrawhelper_p.h \ - painting/qblendfunctions_p.h \ - painting/qrasterdefs_p.h \ - painting/qgrayraster_p.h \ - painting/qpaintengine_blitter_p.h \ - painting/qblittable_p.h \ - - - -if(mmx|3dnow|sse|sse2|iwmmxt|avx) { - HEADERS += painting/qdrawhelper_x86_p.h \ - painting/qdrawingprimitive_sse2_p.h - SSE2_SOURCES += painting/qdrawhelper_sse2.cpp - SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp - IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp - AVX_SOURCES += painting/qdrawhelper_avx.cpp -} - +SSE2_SOURCES += painting/qdrawhelper_sse2.cpp +SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp +IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp +AVX_SOURCES += painting/qdrawhelper_avx.cpp NEON_SOURCES += painting/qdrawhelper_neon.cpp NEON_HEADERS += painting/qdrawhelper_neon_p.h NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S -- cgit v1.2.3