Fixed build with Qt 4.8.4
Fixed build
Reverted some changed I made by mistake
Fixed building with CMake