Import QSQLite from 4.8.1. Import Clementine's smain.cpp and
CMakeLists.txt (thanks, Clementine!). Do some name changing for sanity's
sake so we're sure of which plugin we're actually connected to.
Remove unneeded files
Add FindSqlite and use its values
Merge branch 'master' into thqsqlite
Refresh delegates on both add and remove; also, if ACL can't be displayed cause it's the wrong item type, just don't paint anything at all
Refresh delegates on both add and remove; also, if ACL can't be displayed cause it's the wrong item type, just don't paint anything at all
Merge branch 'thqsqlite'
Wanted to get this in there before 0.5 goes wild, as doing this in a
cleaner code fashion requires re-authing your peers. Adds a friendyname
to Users, so that when there is more fine-grained ACL management you can
set/show the friendly name along with the known screen names of a user.
Make headless mode use the Stream ACL by default
Remove some debug and change around some proxy ordering to make sense when no hostname is passed in
Move proxy factory setup in xmpp client
Merge branch 'master' into atticafixes-waiting-on-attica-release
Bump Attica dep
Changelogify
Automatic merge of Transifex translations
Encode spaces as + and unify encoding logic in GlobalActionManager
Revert usage of boost::threads to speed up id loading. Our MinGW boost package is broken.

Revert "Set future on artist/album immediately after creating promise"

This reverts commit 9d9fae75b549862810d0330729d7878e24a9d8e9.

Revert "Remove duplicate function, and fix copy link from sidebar track page"

This reverts commit 1fe28714cbd1117df496fea5760c365badddb725.

Revert "Catch by const ref and assert to check hypothesis"

This reverts commit a8f0053fc8b68cfff0ff6a7ec383c4ba43e539b9.

Revert "Reimplement QApplication::notify() to print out something about the exception if we can"

This reverts commit 7b8136a36e5bc4b005708470a47a1805cf74314f.

Revert "Catch boost::unitialized_future if it is thrown"

This reverts commit c1d678e2b19076115ca740f639a8c81a41b04481.

Revert "Another boost/thread.hpp include rather than specific boost headers"

This reverts commit ee8d3e6a921bebdcda913c5d5155c3f4511b68e0.

Revert "One include to (hopefully) rule them all"

This reverts commit 52752cd2348b308fcf8bacb9acb59cbf5e56b07b.

Revert "Add another boost include"

This reverts commit 7bec03560a286e481455f93d3a66f411af5989c8.

Revert "Try some more includes"

This reverts commit e56f2f7ee0e8836637f620171c805907252b4a91.

Revert "Remove old code"

This reverts commit 69b56e08364b9fad24e28f63a0d937cf4db2855b.

Revert "Fix oversight in queue draining"

This reverts commit 8c48af423cf88f3ec86c9903c8032cac2c2863b9.

Revert "Safer locking of id() to prevent deadlocks"

This reverts commit 3f2906d4d114e763d72a86cfb2809a9819c1f898.

Revert "Cleanup fixes"

This reverts commit cd3eeb29519bcfabef67ea95d8561864e935c4ca.

Revert "Experimental asynchronous artist and album id loading"

This reverts commit 75eb35397da87e245dc49eb30d3fb1c106fc132a.

Conflicts:

	src/libtomahawk/CMakeLists.txt
Copy shortened track link from page context menu.

Slipped in in the big IdThreadWorker revert in previous commit
Only cache last.fm similar artists/tracks if there is data
Add link to legal page in Help menu. Note: will work properly when stage
is pushed to main, as .html differs