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