Merge "Revert "Revert "Finalizing Q resources""" into qt-dev