Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 20 Jan 2011 16:02:11 +0000 (02:02 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 20 Jan 2011 16:02:11 +0000 (02:02 +1000)
commitaac563013de2702d1129f75dfbdf034a6823825a
tree00bc54c23cd9e9caf89ae6779c8ee0ed1a85ee76
parenta4094648fcc2c80636e851eb233a285d6aa6608e
parente7b4a1ce63b2ef7215627d29921990663af71e01
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