Cleanup QML and CMake code

Merged ivan tkachenko requested to merge work/ratijas/cleanup into master

Merge request reports