diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2015-02-10 10:44:50 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-12 18:18:15 +0000 |
| commit | 081d183d42bac4c939e84615b977ce8b151dd68a (patch) | |
| tree | c40c9f4aafd9509be9d5cf28a55bf0a8de614180 /src/gui/opengl | |
| parent | 25d2e1232bd9dedb7c610336b4e3eae5268739eb (diff) | |
QOpenGLTexture: enable build on Windows CE
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>
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/opengl.pri | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index c78485277f..8659bd6dea 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -32,7 +32,11 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { opengl/qopenglversionfunctionsfactory_p.h \ opengl/qopenglvertexarrayobject.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 \ opengl/qopenglfunctions.cpp \ @@ -53,18 +57,10 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { opengl/qopenglversionfunctionsfactory.cpp \ opengl/qopenglvertexarrayobject.cpp \ opengl/qopengldebug.cpp \ - opengl/qopengltextureblitter.cpp - - !wince* { - HEADERS += opengl/qopengltexture.h \ - opengl/qopengltexture_p.h \ - opengl/qopengltexturehelper_p.h \ - opengl/qopenglpixeltransferoptions.h - - SOURCES += opengl/qopengltexture.cpp \ - opengl/qopengltexturehelper.cpp \ - opengl/qopenglpixeltransferoptions.cpp - } + opengl/qopengltextureblitter.cpp \ + opengl/qopengltexture.cpp \ + opengl/qopengltexturehelper.cpp \ + opengl/qopenglpixeltransferoptions.cpp !contains(QT_CONFIG, opengles2) { HEADERS += opengl/qopenglfunctions_1_0.h \ |