diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-20 17:53:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-20 17:53:05 (GMT) |
| commit | 4cf56db73dc36d230215855398b37bd0c634c099 (patch) | |
| tree | c2d25764b6b157df4f7bbfe7eec9d70fb8442977 /tests/auto/declarative/qdeclarativeloader | |
| parent | a4094648fcc2c80636e851eb233a285d6aa6608e (diff) | |
| parent | de155ecd2b16d9356a19baeb875539a20b36a17c (diff) | |
| download | Qt-4cf56db73dc36d230215855398b37bd0c634c099.zip Qt-4cf56db73dc36d230215855398b37bd0c634c099.tar.gz Qt-4cf56db73dc36d230215855398b37bd0c634c099.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "don't include harfbuzz where we don't use it"
don't accidentaly enable egl when disabling openvg
be more consistent about CFG_EGL_GLES_INCLUDES interpretation
fix build with -opengl es1 in some cases
don't include harfbuzz where we don't use it
don't assign MANIFEST_DIR if we don't need it
Diffstat (limited to 'tests/auto/declarative/qdeclarativeloader')
0 files changed, 0 insertions, 0 deletions