Conflicts: agents/mailfilteragent/autotests/pop3resourceattributetest.cpp mailcommon/collectionpage/autotests/newmailnotifierattributetest.cpp mailcommon/collectionpage/autotests/newmailnotifierattributetest.h messagelist/core/quicksearchline.cpp pimcommon/storageservice/gdrive/gdrivestorageservice.cpp pimcommon/widgets/splittercollapser.cpp pimcommon/widgets/splittercollapser.h pimcommon/widgets/tests/splittercollapsergui_test.cpp pimcommon/widgets/tests/splittercollapsergui_test.h pimcommon/widgets/tests/splittercollapsertest.cpp pimcommon/widgets/tests/splittercollapsertest.h