diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-20 16:02:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-20 16:02:11 (GMT) |
| commit | aac563013de2702d1129f75dfbdf034a6823825a (patch) | |
| tree | 00bc54c23cd9e9caf89ae6779c8ee0ed1a85ee76 /doc/src/snippets/code/src_script_qscriptable.cpp | |
| parent | a4094648fcc2c80636e851eb233a285d6aa6608e (diff) | |
| parent | e7b4a1ce63b2ef7215627d29921990663af71e01 (diff) | |
| download | Qt-aac563013de2702d1129f75dfbdf034a6823825a.zip Qt-aac563013de2702d1129f75dfbdf034a6823825a.tar.gz Qt-aac563013de2702d1129f75dfbdf034a6823825a.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:
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 'doc/src/snippets/code/src_script_qscriptable.cpp')
0 files changed, 0 insertions, 0 deletions