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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits)
  Fix the doc for QFrame::frameStyle
  Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D
  Add runtime check for GLX >= 1.3 before using glXCreatePixmap
  QDrawHelper: Reduce code duplications
  Improve matching X11 VisualIDs to EGL configs
  Remove obsolete function set_winapp_name()
  Speedup fetchTransformedBilinear in the fast_matrix case
  Allow y-interted pixmaps for brushes in GL2 paint engine
  Build fix for mingw
  Fix build with mingw (64 bit)
  Make configure.exe compatible with mingw 64
  Adjust indentation
  e-Ink support cleanup
  Tweak the display update IOCTL calls
  Support 8-Track e-Ink devices
  Get stride from LinuxFB instead of calculating it ourselves.
  Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.
  Fixed bug in QPainterPath::intersected().
  Fix compile error with QT_NO_ANIMATION
  O(n^2) to O(n) optimization in QTreeWidget::selectedItems()
  ...

0 files changed, 0 insertions, 0 deletions