diff options
| author | Jason Barron <jason.barron@digia.com> | 2012-10-15 14:16:51 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-24 02:29:15 +0200 |
| commit | e0c0e83fd5534b24f18d5e02a453182df54933e0 (patch) | |
| tree | b0277ef33d668f49a02203de2c99b1cfbaad5291 /src/src.pro | |
| parent | 84d09214bc54b4a0cf9860aa27e78ae27bfd69f9 (diff) | |
Add ANGLE as a 3rdparty library to Qt.
ANGLE is a component that implements the OpenGL ES 2.0 API on
top of DirectX 9. See the following for more info:
http://code.google.com/p/angleproject/
ANGLE is now the default configuration on Windows. If you
want to use desktop OpenGL, you should build Qt with the
following configure options:
-opengl desktop
To configure Qt to use another OpenGL ES 2 implementation,
you should use:
-opengl es2 -no-angle
Task-number: QTBUG-24207
Change-Id: Iefcbeaa37ed920f431729749ab8333b248fe5134
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro index fe892aa7ad..1ce31eed47 100644 --- a/src/src.pro +++ b/src/src.pro @@ -35,6 +35,9 @@ src_testlib.subdir = $$PWD/testlib src_testlib.target = sub-testlib src_testlib.depends = src_corelib # src_gui & src_widgets are not build-depends +src_angle.subdir = $$PWD/angle +src_angle.target = src_angle + src_gui.subdir = $$PWD/gui src_gui.target = sub-gui src_gui.depends = src_corelib @@ -69,6 +72,10 @@ contains(QT_CONFIG, dbus) { } contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent !contains(QT_CONFIG, no-gui) { + win32:contains(QT_CONFIG, angle) { + SUBDIRS += src_angle + src_gui.depends += src_angle + } SUBDIRS += src_gui src_platformsupport src_plugins.depends += src_gui src_platformsupport !contains(QT_CONFIG, no-widgets) { |