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