Merge branch 'fix-testm3uplaylist'
authorMatěj Laitl <matej@laitl.cz>
Thu, 19 Jul 2012 14:11:16 +0000 (16:11 +0200)
committerMatěj Laitl <matej@laitl.cz>
Thu, 19 Jul 2012 14:11:16 +0000 (16:11 +0200)
commit38497cca7a10d5858e2df14c1f1711fcac9dfd39
treeed50a17af4829c48795700d5db93703ca266f371
parentc3be29c65c6cecd6da1b8de1fbb132666847b1d3
parentf0d64b33bdd6f58d807184a06affaad1c54b8b28
Merge branch 'fix-testm3uplaylist'

* fix-testm3uplaylist:
  EngineController: always call Phonon::availableMimeTypes() from main thread
  EngineController: make supportedMimeTypes() non-static
  EngineController: null-pointer checking in destructor
  EngineController: remove unused and confusing destroy()
  EngineController: ditch canDecode()
  Revert "Prevent hang in testmetamultitrack."

Conflicts:
ChangeLog
src/EngineController.cpp

REVIEW: 105524
Acked-By: Bart (on the review)
ChangeLog
src/EngineController.cpp
src/EngineController.h