gitignore generated files
Merge branch 'master' into run-subscriber-in-thread
Remove stray qDebug
Resolve conflicts