Merge changes Ieb4d16d1,Icef95925 into qt-dev

* changes:
  Adding testing for slot generation
  Change slot generation for BufferState