Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (35 commits)
  Detect GL2 paint engine based on fragment shaders, not programs
  Automatically destroy VG pixmaps when the last window surface goes away
  Change file update for compressed texture support.
  Compressed texture binding for QtOpenGL: ETC1 and PVRTC
  Fix WA_TranslucentBackground for QGLWidgets on X11/EGL
  Add EGL_BUFFER_SIZE to QEglProperties::reduceConfiguration()
  Fixes problem with QMenu when it's populated on the aboutToShow
  Fixed OpenGL graphicssystem issues for OpenGL ES 2.0 platforms.
  Made qobject.h "syncqt compliant".
  Fix toolbar animation when restoring from expanded state
  Make sure that QtGui links with QtCore for the win32-icc mkspec.
  Fixes clipping bug in the embedded dialogs demo.
  Made sure that we didn't reference dangling parallel anchors.
  Add QMake configuration for Scratchbox's host-gcc compilera
  Remove the linux-g++-gles2-experimental mkspec
  Fix crash when QGraphicsItem destructor deletes other QGraphicsItem
  Make lrelease link again with the win32-icc and win32-g++ mkspecs
  Rename the global limit to g_offset.
  Revert "Compile fix for win32-icc."
  QGAL: Remove deprecated assert clauses
  ...

0 files changed, 0 insertions, 0 deletions