summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-12-04 16:00:13 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-12-04 16:00:13 (GMT)
commit0ec20e4fdd70dc11df5932ea2c282efce21dee15 (patch)
tree7387b1db111bb0930e6e01c0b405112a0b317343 /configure
parent8577da4a70be7400b1dc7d2265a31de46f8e8bb9 (diff)
parent33441e2a611f07207b0b942368aab9010cdf8ab1 (diff)
downloadQt-0ec20e4fdd70dc11df5932ea2c282efce21dee15.zip
Qt-0ec20e4fdd70dc11df5932ea2c282efce21dee15.tar.gz
Qt-0ec20e4fdd70dc11df5932ea2c282efce21dee15.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 0b11bf3..6dc3898 100755
--- a/configure
+++ b/configure
@@ -3663,7 +3663,7 @@ Qt/X11 only:
-no-opengl ......... Do not support OpenGL.
+ -opengl <api> ...... Enable OpenGL support.
With no parameter, this will auto-detect the "best"
- OpenGL API to use. If desktop OpenGL is avaliable, it
+ OpenGL API to use. If desktop OpenGL is available, it
will be used. Use desktop, es1, es1cl or es2 for <api>
to force the use of the Desktop (OpenGL 1.x or 2.x),
OpenGL ES 1.x Common profile, 1.x Common Lite profile