diff options
| author | Keith Isdale <keith.isdale@nokia.com> | 2009-11-02 04:59:24 (GMT) |
|---|---|---|
| committer | Keith Isdale <keith.isdale@nokia.com> | 2009-11-02 04:59:24 (GMT) |
| commit | 504ac5668c7308dc67233ed8589eeadcd23e7cdd (patch) | |
| tree | 04259889f1c7d57f7002b537834cdf396a9ea6b2 | |
| parent | 55dcc5551e338ba16c0db8c7d6593554d3d019b8 (diff) | |
| download | Qt-504ac5668c7308dc67233ed8589eeadcd23e7cdd.zip Qt-504ac5668c7308dc67233ed8589eeadcd23e7cdd.tar.gz Qt-504ac5668c7308dc67233ed8589eeadcd23e7cdd.tar.bz2 | |
Compilation failure QtOpenGL when Opengl ES is used on Qt for Windows CE
Enable building egl/qegl_wince.cpp when a wince* mkspec is used
Add "egl" to QT_CONFIG when any of the OpenGL ES variants is used
Task-number: QTBUG-5073
Reviewed-by: Trond Kjernåsen
| -rw-r--r-- | src/gui/egl/egl.pri | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri index ba991bd..627d511 100644 --- a/src/gui/egl/egl.pri +++ b/src/gui/egl/egl.pri @@ -6,7 +6,7 @@ SOURCES += \ egl/qegl.cpp \ egl/qeglproperties.cpp -contains(QT_CONFIG, wince*): SOURCES += egl/qegl_wince.cpp +wince*: SOURCES += egl/qegl_wince.cpp unix { embedded { diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 6d46c18..dd3823b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2438,14 +2438,17 @@ void Configure::generateOutputVars() if ( dictionary["OPENGL_ES_CM"] == "yes" ) { qtConfig += "opengles1"; + qtConfig += "egl"; } if ( dictionary["OPENGL_ES_2"] == "yes" ) { qtConfig += "opengles2"; + qtConfig += "egl"; } if ( dictionary["OPENGL_ES_CL"] == "yes" ) { qtConfig += "opengles1cl"; + qtConfig += "egl"; } if ( dictionary["OPENVG"] == "yes" ) { |