[trunk] Having both options for Moc files available