diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:31 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:53 +0200 |
commit | 6e5818f2bbc8443b9308252a5e1543e014ef439d (patch) | |
tree | 07922adee2f13e818b9439c8a0bdf871dda59039 /src/angle/README.qt | |
parent | 32aac0a1c009ee940920fd12f277180dd80b8eff (diff) | |
parent | deac55becd18efa4504eb686a1bb8081a5cd488a (diff) |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
Diffstat (limited to 'src/angle/README.qt')
-rw-r--r-- | src/angle/README.qt | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/angle/README.qt b/src/angle/README.qt new file mode 100644 index 0000000000..61023efcd1 --- /dev/null +++ b/src/angle/README.qt @@ -0,0 +1,29 @@ +This is the ANGLE project from: + +http://code.google.com/p/angleproject/ + +The upstream version used here can be found in: + +src/common/version.h + +This copy of the library has been modified with several patches +that can be found in the 'patches' subdirectory. + +Updating ANGLE +------------------------------------------------------------- +To update to a newer version of ANGLE, extract the archive +directly into the 'src/3rdparty/angle' directory. ANGLE contains +a .gitignore file that will overwrite the one in Qt, but this is +not desirable so the ANGLE one should be discarded and the one in +Qt should be kept. If there are new source/header files in ANGLE +(git status -u) then they should be added to the relevant .pro +file before committing. + + +Using a custom ANGLE +------------------------------------------------------------- +Qt supports building a version of ANGLE other than the one that +is contained in the source tree. To get Qt to build a different +copy of ANGLE, you can set the ANGLE_DIR environment variable +to point to the location of the custom ANGLE before building Qt. + |