../ autopilot/Merged with trunk... resolved conflicts.12 years ago copyright/ data/ libs/Add touch ownership logic on top of qt input handling12 years ago mocks/Add audioRole to QtMultimedia mock12 years ago plugins/Add a hinting animation to indicate changes in the backend Fixes: 1376707 Approved by: Daniel d'Andrada12 years ago qmltests/Don't lock phone if user tries to switch back to an active call. Fixes: 1388156 Approved by: Michael Zanetti12 years ago uqmlscene/use real timers in TouchRegistry when running "make tryFoo" tests (uqmlscene)12 years ago utils/use real timers in TouchRegistry when running "make tryFoo" tests (uqmlscene)12 years ago whitespace/ CMakeLists.txtAdd touch ownership logic on top of qt input handling12 years ago