Revert "Trimmed the branch to only the qt_gui sub directory"

This reverts commit 24804ef44e6aa1a27e487d07094cbf0057ed5ad4.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the qt_gui sub directory