diff options
| author | Nicolas Arnaud-Cormos <nicolas.arnaud-cormos.qnx@kdab.com> | 2012-09-06 14:35:06 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-07 12:29:58 (GMT) |
| commit | 7e221d37153974774d6d9af4cae399a38ed21281 (patch) | |
| tree | 0f0ead52ad56eee80411d00ca24ebd3aade47691 /tools | |
| parent | 2df3a87d1013c38e9aa8d90b6f2a5552bf88aaf4 (diff) | |
| download | Qt-7e221d37153974774d6d9af4cae399a38ed21281.zip Qt-7e221d37153974774d6d9af4cae399a38ed21281.tar.gz Qt-7e221d37153974774d6d9af4cae399a38ed21281.tar.bz2 | |
Never compile QPA with EGL support on Windows
It's a follow-up of d7168ae0ff930f19f206a1b56c03fc35b22bb948,
which is doing exactly the same on linux.
Change-Id: Id9eb996d2edf5867491fd420bdf743e0f799a778
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 142b2be..d98b5bb 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2852,17 +2852,20 @@ void Configure::generateOutputVars() if (dictionary["OPENGL_ES_CM"] == "yes") { qtConfig += "opengles1"; - qtConfig += "egl"; + if (dictionary["QPA"] == "no") + qtConfig += "egl"; } if (dictionary["OPENGL_ES_2"] == "yes") { qtConfig += "opengles2"; - qtConfig += "egl"; + if (dictionary["QPA"] == "no") + qtConfig += "egl"; } if (dictionary["OPENVG"] == "yes") { qtConfig += "openvg"; - qtConfig += "egl"; + if (dictionary["QPA"] == "no") + qtConfig += "egl"; } if (dictionary["S60"] == "yes") { @@ -3420,9 +3423,10 @@ void Configure::generateConfigfiles() if (dictionary["S60"] == "no") qconfigList += "QT_NO_S60"; if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES"; - if (dictionary["OPENGL_ES_CM"] == "no" && - dictionary["OPENGL_ES_2"] == "no" && - dictionary["OPENVG"] == "no") qconfigList += "QT_NO_EGL"; + if ((dictionary["OPENGL_ES_CM"] == "no" + && dictionary["OPENGL_ES_2"] == "no" + && dictionary["OPENVG"] == "no") + || (dictionary["QPA"] == "yes")) qconfigList += "QT_NO_EGL"; if (dictionary["OPENGL_ES_CM"] == "yes" || dictionary["OPENGL_ES_2"] == "yes") qconfigList += "QT_OPENGL_ES"; |