Merge pull request #2 from chriadam/master

[libqmfclient] Modify .provider/.service to be less generic
[qmf] Add default icon paths for email service/provider
[qmf] Don't try to destruct/cancel SSO session for accounts saved outside SSO.
Merge pull request #3 from nemomobile-packages/vdv-devel

[qmf] Don't try to destruct/cancel SSO session for accounts saved outside SSO
[qmf] Register SSO accounts that were initially created with disabled email service.
Merge pull request #4 from nemomobile-packages/vdv-devel

[qmf] Register SSO accounts that were initially created with disabled email service
[qmf] Update to upstream version 4.0.3
Squashed 'qmf/' changes from 0b312e9..8bcfbaa

8bcfbaa Rework the build system to better use parallel builds.
a84920f libqmfclient: export a few private classes used by messageserver.
f3ef1f7 Add missing include.

git-subtree-dir: qmf
git-subtree-split: 8bcfbaab19a14cab2b77b4b89dc5811e0d709e0e
Merge commit '4ca1b05a9ed9011ab0033d74f93687747217f29c' into vdv-devel

Conflicts:
	qmf/messagingframework.pro
Move password plugin to the plugins dir
Merge pull request #5 from nemomobile-packages/vdv-devel

[qmf] Update to upstream version 4.0.3
[qmf] Update to upstream version 4.0.3.1
Squashed 'qmf/' changes from 8bcfbaa..d0754cc

d0754cc Convert QByteArray to QString using QString::fromLatin1().

git-subtree-dir: qmf
git-subtree-split: d0754cc681e9782aa36e3a5b9560cedcdf91b05b
Merge commit '3288d9ca93e8aadfc93df92b7303cc49e217567a'
[qmf] Change email provider/service names.
Fix typo
Change service name to "Email"
Merge pull request #6 from nemomobile-packages/vdv-devel

[qmf] Change email provider/service names.
Upstream commit
[Qmf] Add iconPath property to QMailAccount.