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:
  Compile
  Implement a special case, simplified vertex shader for complex geometry
  Revert "small cleanup regarding delayed layout in itemviews"
  Make sure the delete and backspace keys are ignored when keyb-searching
  Fix a crash in QSortFilterProxyModel when deleting a row
  small cleanup regarding delayed layout in itemviews
  Fixed wasted space in the texture cache.
  Get debug code compiling since function signature changes
  --warn;
  That file was forgotten when adding SSE support under mingw

0 files changed, 0 insertions, 0 deletions