equal
deleted
inserted
replaced
13 !win32:!embedded:!mac:CONFIG += x11 |
13 !win32:!embedded:!mac:CONFIG += x11 |
14 contains(QT_CONFIG, opengl):CONFIG += opengl |
14 contains(QT_CONFIG, opengl):CONFIG += opengl |
15 contains(QT_CONFIG, opengles1):CONFIG += opengles1 |
15 contains(QT_CONFIG, opengles1):CONFIG += opengles1 |
16 contains(QT_CONFIG, opengles1cl):CONFIG += opengles1cl |
16 contains(QT_CONFIG, opengles1cl):CONFIG += opengles1cl |
17 contains(QT_CONFIG, opengles2):CONFIG += opengles2 |
17 contains(QT_CONFIG, opengles2):CONFIG += opengles2 |
18 |
18 contains(QT_CONFIG, egl):CONFIG += egl |
19 contains(QT_CONFIG, opengles.*) { |
|
20 for(p, QMAKE_LIBDIR_EGL) { |
|
21 exists($$p):LIBS_PRIVATE += -L$$p |
|
22 } |
|
23 !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL |
|
24 !isEmpty(QMAKE_LIBS_EGL): LIBS_PRIVATE += $$QMAKE_LIBS_EGL |
|
25 } |
|
26 |
19 |
27 HEADERS += qgl.h \ |
20 HEADERS += qgl.h \ |
28 qgl_p.h \ |
21 qgl_p.h \ |
29 qglcolormap.h \ |
22 qglcolormap.h \ |
30 qglpixelbuffer.h \ |
23 qglpixelbuffer.h \ |
59 gl2paintengineex/qglengineshadermanager_p.h \ |
52 gl2paintengineex/qglengineshadermanager_p.h \ |
60 gl2paintengineex/qgl2pexvertexarray_p.h \ |
53 gl2paintengineex/qgl2pexvertexarray_p.h \ |
61 gl2paintengineex/qpaintengineex_opengl2_p.h \ |
54 gl2paintengineex/qpaintengineex_opengl2_p.h \ |
62 gl2paintengineex/qglengineshadersource_p.h \ |
55 gl2paintengineex/qglengineshadersource_p.h \ |
63 gl2paintengineex/qglcustomshaderstage_p.h \ |
56 gl2paintengineex/qglcustomshaderstage_p.h \ |
64 gl2paintengineex/qtriangulatingstroker_p.h |
57 gl2paintengineex/qtriangulatingstroker_p.h |
65 |
58 |
66 SOURCES += qglshaderprogram.cpp \ |
59 SOURCES += qglshaderprogram.cpp \ |
67 qglpixmapfilter.cpp \ |
60 qglpixmapfilter.cpp \ |
68 qgraphicsshadereffect.cpp \ |
61 qgraphicsshadereffect.cpp \ |
69 qgraphicssystem_gl.cpp \ |
62 qgraphicssystem_gl.cpp \ |
101 # pull in the proper freetype2 include directory |
94 # pull in the proper freetype2 include directory |
102 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) |
95 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) |
103 LIBS_PRIVATE += -lfreetype |
96 LIBS_PRIVATE += -lfreetype |
104 } else { |
97 } else { |
105 ### Note: how does this compile with a non-system freetype? |
98 ### Note: how does this compile with a non-system freetype? |
106 # This probably doesn't compile |
99 # This probably does not compile |
107 } |
100 } |
108 } else { |
101 } else { |
109 DEFINES *= QT_NO_FREETYPE |
102 DEFINES *= QT_NO_FREETYPE |
110 } |
103 } |
111 |
104 |
147 DEFINES *= QT_NO_FREETYPE |
140 DEFINES *= QT_NO_FREETYPE |
148 } |
141 } |
149 } |
142 } |
150 |
143 |
151 INCLUDEPATH += ../3rdparty/harfbuzz/src |
144 INCLUDEPATH += ../3rdparty/harfbuzz/src |
152 |
|
153 wince*: { |
|
154 contains(QT_CONFIG,opengles1) { |
|
155 QMAKE_LIBS += "libGLES_CM.lib" |
|
156 } |
|
157 contains(QT_CONFIG,opengles1cl) { |
|
158 QMAKE_LIBS += "libGLES_CL.lib" |
|
159 } |
|
160 contains(QT_CONFIG,opengles2) { |
|
161 QMAKE_LIBS += "libGLESv2.lib" |
|
162 } |
|
163 |
|
164 } else { |
|
165 LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL |
|
166 LIBS += $$QMAKE_LFLAGS_OPENGL |
|
167 } |
|