[automerger skipped] Merge "Revert "Fix drag and drop (2/3)"" into qt-qpr1-dev am: ee79dee7e6 am: 37502e2fa2 -s ours
am skip reason: Change-Id I31e60725035d5af06884521499aed9fc07e505c9 with SHA-1 438fb283e6 is in history

Change-Id: I7cd274a7f350880959d1a5ab06d42aa0aa59f485