Make things work with upstream QML module macros and do some general CMake cleanup
This effectively rewrites the CMake for both modules contained here, making use of the features of upstream's new QML module macros through the ecm_add_qml_module
port that is being done in frameworks/extra-cmake-modules!364 (merged) . In addition there's some additional cleanup of the CMake files.