← Back to branch summary

~oif-team/ubuntu/natty/qt4-x11/xi2.1

« back to all changes in this revision

Viewing changes to src/gui/painting/painting.pri

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-11-02 18:30:08 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (15.2.5 experimental)
  • mto: This revision was merged to the branch mainline in revision 88.
  • Revision ID: james.westby@ubuntu.com-20091102183008-b6a4gcs128mvfb3m
Tags: upstream-4.6.0~beta1
Import upstream version 4.6.0~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/painting/painting.pri
14
14
        painting/qoutlinemapper_p.h \
15
15
        painting/qpaintdevice.h \
16
16
        painting/qpaintengine.h \
17
 
        painting/qpaintengine_p.h \
 
17
                painting/qpaintengine_p.h \
18
18
        painting/qpaintengine_alpha_p.h \
19
19
        painting/qpaintengine_preview_p.h \
20
20
        painting/qpaintengineex_p.h \
22
22
        painting/qpainter_p.h \
23
23
        painting/qpainterpath.h \
24
24
        painting/qpainterpath_p.h \
 
25
        painting/qvectorpath_p.h \
25
26
        painting/qpathclipper_p.h \
26
27
        painting/qpdf_p.h \
27
28
        painting/qpen.h \
42
43
        painting/qtransform.h \
43
44
        painting/qwindowsurface_p.h \
44
45
        painting/qwmatrix.h \
 
46
        painting/qpaintbuffer_p.h
45
47
 
46
48
 
47
49
SOURCES += \
48
50
        painting/qbezier.cpp \
49
 
        painting/qblendfunctions.cpp \
 
51
        painting/qblendfunctions.cpp \
50
52
        painting/qbrush.cpp \
51
53
        painting/qcolor.cpp \
52
54
        painting/qcolor_p.cpp \
57
59
        painting/qmatrix.cpp \
58
60
        painting/qmemrotate.cpp \
59
61
        painting/qoutlinemapper.cpp \
 
62
        painting/qpaintdevice.cpp \
60
63
        painting/qpaintengine.cpp \
61
64
        painting/qpaintengine_alpha.cpp \
62
65
        painting/qpaintengine_preview.cpp \
75
78
        painting/qstroker.cpp \
76
79
        painting/qstylepainter.cpp \
77
80
        painting/qtessellator.cpp \
78
 
        painting/qwindowsurface.cpp \
79
81
        painting/qtextureglyphcache.cpp \
80
82
        painting/qtransform.cpp \
 
83
        painting/qwindowsurface.cpp \
 
84
        painting/qpaintbuffer.cpp
81
85
 
82
 
        DEFINES += QT_RASTER_IMAGEENGINE
83
 
        win32:DEFINES += QT_RASTER_PAINTENGINE
84
 
        embedded:DEFINES += QT_RASTER_PAINTENGINE
85
86
        SOURCES +=                                      \
86
87
                painting/qpaintengine_raster.cpp        \
87
88
                painting/qdrawhelper.cpp                \
100
101
                painting/qcolormap_win.cpp \
101
102
                painting/qpaintdevice_win.cpp \
102
103
                painting/qprintengine_win.cpp \
103
 
                painting/qprinterinfo_win.cpp \
104
 
                painting/qregion_win.cpp
 
104
                painting/qprinterinfo_win.cpp
 
105
 
105
106
        !win32-borland:!wince*:LIBS += -lmsimg32
106
 
        contains(QT_CONFIG, direct3d) {
107
 
                HEADERS += painting/qpaintengine_d3d_p.h
108
 
                SOURCES += painting/qpaintengine_d3d.cpp
109
 
                RESOURCES += painting/qpaintengine_d3d.qrc
110
 
                LIBS += -ldxguid
111
 
        }
112
107
}
113
108
 
114
109
embedded {
132
127
        painting/qwindowsurface_raster.cpp \
133
128
}
134
129
 
135
 
wince* {
136
 
        SOURCES -= painting/qregion_win.cpp
137
 
}
138
 
 
139
130
unix:x11 {
140
131
        HEADERS += \
141
132
                painting/qpaintengine_x11_p.h
162
153
                painting/qprintengine_mac.mm \
163
154
}
164
155
 
165
 
unix:!mac {
 
156
unix:!mac:!symbian {
166
157
        HEADERS += \
167
158
                painting/qprinterinfo_unix_p.h
168
159
        SOURCES += \
169
160
                painting/qprinterinfo_unix.cpp
170
161
}
171
162
 
172
 
win32|x11|mac|embedded {
 
163
win32|x11|mac|embedded|symbian {
173
164
        SOURCES += painting/qbackingstore.cpp
174
165
        HEADERS += painting/qbackingstore_p.h
175
166
}
186
177
                painting/qpaintdevice_qws.cpp
187
178
}
188
179
 
 
180
symbian {
 
181
        SOURCES += \
 
182
                                painting/qpaintengine_s60.cpp \
 
183
                painting/qregion_s60.cpp \
 
184
                painting/qcolormap_s60.cpp
 
185
 
 
186
        HEADERS += \
 
187
                painting/qpaintengine_s60_p.h
 
188
}
 
189
 
189
190
x11|embedded {
190
191
        contains(QT_CONFIG,qtopia) {
191
192
            DEFINES += QT_NO_CUPS QT_NO_LPR
231
232
 
232
233
    win32-g++|!win32:!*-icc* {
233
234
        mmx {
234
 
            mmx_compiler.commands = $$QMAKE_CXX -c -Winline 
 
235
            mmx_compiler.commands = $$QMAKE_CXX -c -Winline
235
236
 
236
237
            mac {
237
238
                mmx_compiler.commands += -Xarch_i386 -mmmx
362
363
        SOURCES += painting/qwindowsurface_qws.cpp
363
364
}
364
365
 
365
 
win32:contains(QT_CONFIG, direct3d) {
366
 
        HEADERS += painting/qwindowsurface_d3d_p.h
367
 
        SOURCES += painting/qwindowsurface_d3d.cpp
 
366
 
 
367
 
 
368
symbian {
 
369
        HEADERS += painting/qwindowsurface_s60_p.h
 
370
        SOURCES += painting/qwindowsurface_s60.cpp
 
371
        armccIfdefBlock = \
 
372
        "$${LITERAL_HASH}if defined(ARMV6)" \
 
373
        "MACRO QT_HAVE_ARMV6" \
 
374
        "SOURCEPATH     painting" \
 
375
        "SOURCE                 qblendfunctions_armv6_rvct.s" \
 
376
        "SOURCE                 qdrawhelper_armv6_rvct.s" \
 
377
        "$${LITERAL_HASH}endif"
 
378
 
 
379
        MMP_RULES += armccIfdefBlock
 
380
        QMAKE_CXXFLAGS.ARMCC *= -O3
 
381
}
 
382
 
 
383
contains(QT_CONFIG, zlib) {
 
384
   INCLUDEPATH += ../3rdparty/zlib
 
385
} else:!contains(QT_CONFIG, no-zlib) {
 
386
   unix:LIBS_PRIVATE += -lz
 
387
#  win32:LIBS += libz.lib
368
388
}
369
389