1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QOpenGLTexture: enable build on Windows CE

Browse Source 
The various refactorings to this code allow it compile and work
on Windows CE, so we can enable the build there.

Change-Id: I8ac56e87dca13790a76f125330a5400e4b4f5d46
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
This commit is contained in:
Giuseppe D'Angelo 2015-02-10 10:44:50 +01:00 committed by Sean Harmer
parent 25d2e1232b
commit 081d183d42
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/opengl/opengl.pri
View File

@ -32,7 +32,11 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
opengl/qopenglversionfunctionsfactory_p.h \ opengl/qopenglversionfunctionsfactory_p.h \
opengl/qopenglvertexarrayobject.h \ opengl/qopenglvertexarrayobject.h \
opengl/qopengldebug.h \ opengl/qopengldebug.h \
opengl/qopengltextureblitter_p.h opengl/qopengltextureblitter_p.h \
opengl/qopengltexture.h \
opengl/qopengltexture_p.h \
opengl/qopengltexturehelper_p.h \
opengl/qopenglpixeltransferoptions.h
SOURCES += opengl/qopengl.cpp \ SOURCES += opengl/qopengl.cpp \
opengl/qopenglfunctions.cpp \ opengl/qopenglfunctions.cpp \
@ -53,18 +57,10 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
opengl/qopenglversionfunctionsfactory.cpp \ opengl/qopenglversionfunctionsfactory.cpp \
opengl/qopenglvertexarrayobject.cpp \ opengl/qopenglvertexarrayobject.cpp \
opengl/qopengldebug.cpp \ opengl/qopengldebug.cpp \
opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.cpp \
opengl/qopengltexture.cpp \
!wince* { opengl/qopengltexturehelper.cpp \
HEADERS += opengl/qopengltexture.h \ opengl/qopenglpixeltransferoptions.cpp
opengl/qopengltexture_p.h \
opengl/qopengltexturehelper_p.h \
opengl/qopenglpixeltransferoptions.h
SOURCES += opengl/qopengltexture.cpp \
opengl/qopengltexturehelper.cpp \
opengl/qopenglpixeltransferoptions.cpp
}
!contains(QT_CONFIG, opengles2) { !contains(QT_CONFIG, opengles2) {
HEADERS += opengl/qopenglfunctions_1_0.h \ HEADERS += opengl/qopenglfunctions_1_0.h \