Merge "Revert "Fix drag and drop (1/3)"" into qt-qpr1-dev