diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-05 11:38:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 18:40:26 +0100 |
| commit | cb22d3bbba7bf7938561f7093ebaed92e6111f02 (patch) | |
| tree | 837152dde10434a0e5206805b88788da69040664 /src/angle | |
| parent | 9fe16e0ee92863c364fcb6f871b0691bbf43059a (diff) | |
consolidate syncqt invocations
Change-Id: Ic28ea95201501b05c4a62366d1f70fa120161927
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/angle')
| -rw-r--r-- | src/angle/angle.pro | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/angle/angle.pro b/src/angle/angle.pro index 00e0501d60..371e39868f 100644 --- a/src/angle/angle.pro +++ b/src/angle/angle.pro @@ -1,19 +1,10 @@ TEMPLATE = subdirs SUBDIRS += src -# We need to call syncqt manually instead of using "load(qt_module_headers)" for several reasons: +# We do it this way instead of letting load(qt_module) handle it for two reasons: # 1) qt_module_headers assumes the TARGET is the same as the include directory (eg: libGLESv2 != GLES2) # 2) If we made a 'QtANGLE' module, the include directory would be flattened which won't work since # we need to support "#include <GLES2/gl2.h>" -!build_pass { - qtPrepareTool(QMAKE_SYNCQT, syncqt) - QTDIR = $$[QT_HOST_PREFIX] - exists($$QTDIR/.qmake.cache): \ - mod_component_base = $$QTDIR - else: \ - mod_component_base = $$dirname(_QMAKE_CACHE_) - QMAKE_SYNCQT += -minimal -module KHR -module EGL -module GLES2 \ - -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs -outdir $$mod_component_base $$dirname(_QMAKE_CONF_) - !silent:message($$QMAKE_SYNCQT) - system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") -} +CONFIG += minimal_syncqt +QMAKE_SYNCQT_OPTIONS = -module KHR -module EGL -module GLES2 +load(qt_module_headers) |