Merge remote-tracking branch 'origin/Applications/16.04'

CMakeLists.txt

@@ -18,7 +18,6 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddTests)
 
-
 set(PIM_VERSION "5.2.54")
 set(MAILCOMMON_LIB_VERSION ${PIM_VERSION})
 set(KF5_VERSION "5.19.0")

src/folder/accountconfigorderdialog.cpp

@@ -214,6 +214,7 @@ void AccountConfigOrderDialog::init()
             }
         }
     }
+    instanceList.sort(Qt::CaseInsensitive);
     const int numberOfList(listOrderAccount.count());
     for (int i = 0; i < numberOfList; ++i) {
         instanceList.removeOne(listOrderAccount.at(i));