summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-04-04 13:33:02 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-04-04 13:34:19 (GMT)
commita715d1fe5e9a9781218701afe9c10f2ba54448ea (patch)
tree8ef4f511e7fbf4ba88cbf7254758e5a16068cea5 /configure
parente8d31fa99352c18d469394d65c80541b7788440c (diff)
downloadQt-a715d1fe5e9a9781218701afe9c10f2ba54448ea.zip
Qt-a715d1fe5e9a9781218701afe9c10f2ba54448ea.tar.gz
Qt-a715d1fe5e9a9781218701afe9c10f2ba54448ea.tar.bz2
Made Qt applications get the correct GLES2 include path.
Use the same as the one used when building QtOpenGL + examples/demos. Reviewed-by: Jørgen Lind
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index 83c836c..167ae1b 100755
--- a/configure
+++ b/configure
@@ -8330,6 +8330,11 @@ if [ -n "$QT_CFLAGS_FPU" ]; then
echo "MMP_RULES += \"ARMFPU $QT_CFLAGS_FPU\"" >> "$QTCONFIG.tmp"
fi
+if [ -n "$QMAKE_INCDIR_OPENGL_ES2" ]; then
+ echo "\n#Qt opengl include path" >> "$QTCONFIG.tmp"
+ echo "QMAKE_INCDIR_OPENGL_ES2 = \"$QMAKE_INCDIR_OPENGL_ES2\"" >> "$QTCONFIG.tmp"
+fi
+
# replace qconfig.pri if it differs from the newly created temp file
if cmp -s "$QTCONFIG.tmp" "$QTCONFIG"; then
rm -f "$QTCONFIG.tmp"