Add missing /Factory/
Add missing Q_OBJECT macros