Merge branch 'master' into 'master'

make hostname placeholder serviceType-dipendent

See merge request !12

plugins/core/mail/setupwizard/components/ServerDetails.qml

@@ -67,7 +67,7 @@ Item {
             id: server
             objectName: "serverInputField"
             title: qsTr("Hostname")
-            placeholderText: "imap.example.org"
+            placeholderText: serviceType+".example.org"
             inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhEmailCharactersOnly
             text: accountConfig ?  accountConfig.server : ""
         }