diff options
| author | Keith Isdale <keith.isdale@nokia.com> | 2009-11-02 07:11:28 (GMT) |
|---|---|---|
| committer | Keith Isdale <keith.isdale@nokia.com> | 2009-11-02 07:11:28 (GMT) |
| commit | d47bc05931004c7384e77ff358d67feddb84d501 (patch) | |
| tree | fe802146d9fd33d9f45d83d93bb459678fea6d89 | |
| parent | 2f97ddf87f817ce8ae42095d96644ff5fca131e6 (diff) | |
| download | Qt-d47bc05931004c7384e77ff358d67feddb84d501.zip Qt-d47bc05931004c7384e77ff358d67feddb84d501.tar.gz Qt-d47bc05931004c7384e77ff358d67feddb84d501.tar.bz2 | |
Compilation failure for OpenGL and OpenVG graphic system plugins when
Opengl ES is used on Qt for Windows CE
Simplify logic as OpenGL graphic system is not supported for WindowsCE
Task-number: QTBUG-5080
Reviewed-by: Rhys Weatherley
| -rw-r--r-- | src/plugins/graphicssystems/graphicssystems.pro | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/graphicssystems/graphicssystems.pro b/src/plugins/graphicssystems/graphicssystems.pro index ca87b98..0788933 100644 --- a/src/plugins/graphicssystems/graphicssystems.pro +++ b/src/plugins/graphicssystems/graphicssystems.pro @@ -1,13 +1,7 @@ TEMPLATE = subdirs SUBDIRS += trace -!wince*{ - contains(QT_CONFIG, opengl):SUBDIRS += opengl - contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl):SUBDIRS += openvg -}else { - # For WindowsCE only 2.x of OpenGL ES is supported by these plugins at this time - contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):SUBDIRS += opengl - contains(QT_CONFIG, openvg):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):contains(QT_CONFIG, egl):SUBDIRS += openvg -} +!wince*:contains(QT_CONFIG, opengl):SUBDIRS += opengl +contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl):SUBDIRS += openvg contains(QT_CONFIG, shivavg) { # Only works under X11 at present |