Merge pull request #15 from chriadam/master

[qmf] Update email.provider icon
[QMF] Use service username instead of global if it exists.
Merge pull request #16 from nemomobile-packages/vdv-devel

[QMF] Use service username instead of global if it exists.
[qmf] Fields which are matched case-insensitive should sort similarly

Text fields that are matched with case-insensitive matching should
also be sorted with case-insensitive collation.

Also includes fix to extend case insensitivity to matching for mail
thread keys.
Merge pull request #18 from matthewvogt/case-insensitive-sort

[qmf] Fields which are matched case-insensitive should sort similarly
Rebase Upstream
Squashed 'qmf/' changes from d0754cc..bcc4578

bcc4578 Create default .conf file for logs with logging disabled.
3d4ed22 Remove old test cases from test.xml
c4aefac Add iconPath property to QMailAccount

git-subtree-dir: qmf
git-subtree-split: bcc4578732b757d606e61aba631a6ed2e3c63581
Merge commit 'ee4e897ab24dcef1c285f236cf57d8c7eaf16005'

Conflicts:
	qmf/src/libraries/qmfclient/qmailstore_p.cpp
	qmf/tests/qt5/tests.xml
	qmf/tests/tests.xml
Fix merge conflits
[qmf] Send correct smtp command when auth is not required(SmtpConfiguration::Auth_NONE)
Merge pull request #19 from nemomobile-packages/vdv-devel

[qmf] Send correct smtp command when auth is not required(SmtpConfiguration::Auth_NONE)
[qmf] Use password from SSO for CramMd5 authentication.
Merge pull request #20 from nemomobile-packages/vdv-devel

[qmf] Use password from SSO for CramMd5 authentication.
[qmf] Make SMTP AUTH PLAIN more robust.

SMTP authentication using AUTH PLAIN supports two ways to send the information to the server,
seems that some servers don't support anymore auth in two steps:

c: AUTH PLAIN
S: 334
C: <UserName and password encoded in base64>
S: 235 2.7.0 Authentication successful

Auth in one step introduced by this commit, better to reduce communication with the server

c: AUTH PLAIN <UserName and password encoded in base64>
S: 235 2.7.0 Authentication successful
Merge pull request #21 from nemomobile-packages/smtp-improvement

[qmf] Make SMTP AUTH PLAIN more robust.
[qmf] Merge lastest upstream
Squashed 'qmf/' changes from bcc4578..75ccc57

75ccc57 Remove deprecated qMetaTypeId warning.
654abba Correctly start messageserver5 binary.
167c78a OS X: Don't build messageserver binary as a bundle.
6243c57 Comment out a use of QMailThreadSortKey::deserialize.
e431c08 Inherit tst_QCop from QCopAdaptor, as it uses some protected API.
8b0d7d8 Export QMailThreadPrivate, as it uses QPrivatelyImplemented.
f0999f3 Make imap compress with zlib enabled on Mac.
1183b51 Detection of libraries built as framework or dylib on Mac
67cb170 Introduce one step AUTH PLAIN for SMTP.

git-subtree-dir: qmf
git-subtree-split: 75ccc57575295070f01f76e2c21273b6abba89e9
Merge commit 'f45c603ea6fe4dc36f72d0122fad05017e641c03'

Conflicts:
	qmf/tests/tests.pri
[qmf] fix Test deployment path overwrriten by pervious rebase.
Merge pull request #22 from nemomobile-packages/vdv-devel

[qmf] fix Test deployment path overwrriten by pervious rebase.