- added new example
- fixed merge
- fixed QT settings