qtsensors and qtlocation merged (thanks Friedemann). qtsystems needs a fix in qtbase (https://codereview.qt-project.org/#change,23709) before we can try to restage https://codereview.qt-project.org/#change,21847 and friends.
qtpim is failing several tests because of assumptions on QHash element order. I'm disabling them in https://codereview.qt-project.org/#change,23705. The organizermanager autotest has also failed on _some_ CI runs: jsondb: no process found FAIL! : tst_QOrganizerManager::remove(mgr='memory') Compared values are not the same Actual (cm->itemsForExport().size()): 3 Expected (2): 2 Loc: [tst_qorganizermanager.cpp(1564)] Kent ________________________________________ From: [email protected] [[email protected]] on behalf of Hansen Kent (Nokia-MP/Oslo) Sent: Wednesday, April 18, 2012 3:40 PM To: [email protected] Subject: Re: [Development] api_changes merged back to master qtdeclarative/api_changes got merged, and now several others after that. qtpim, qtsensors and qtsystems still remaining (merge attempts are all in progress). Best regards, Kent Den 18. april 2012 00:29, skrev ext Donald Carr: > yetch, and again, sorry Kent > > Were I but a beautiful woman, I would lend you a hug to give you the > power to put this turkey down, once and for all. > > KO > > On Tue, Apr 17, 2012 at 8:36 PM,<[email protected]> wrote: >> Hi, >> The qtdeclarative merge (https://codereview.qt-project.org/#change,23550) >> still hasn't gone through; tests are crashing in the latest attempt. >> >> Modules that depend on qtdeclarative won't be able to merge any changes >> until the above merge is completed. >> >> Kent >> >> ________________________________________ >> From: [email protected] >> [[email protected]] on behalf of >> Knoll Lars (Nokia-MP/Oslo) >> Sent: Tuesday, April 17, 2012 4:52 PM >> To: [email protected] >> Subject: [Development] api_changes merged back to master >> >> Hi everybody, >> >> the merge of api_changes back into master for qtbase finally made it's way >> through the CI system. I'm currently in the process of merging declarative >> back and Kent is staging all the changes required to fix compilation of >> the other modules. >> >> > From now on most changes should go to master. I'll keep api_changes around >> for another little while as there are still some changes in gerrit against >> it, but I would like to empty this queue now and then remove the >> api_changes branch soon. >> >> Cheers, >> Lars >> >> _______________________________________________ >> Development mailing list >> [email protected] >> http://lists.qt-project.org/mailman/listinfo/development >> _______________________________________________ >> Development mailing list >> [email protected] >> http://lists.qt-project.org/mailman/listinfo/development > > _______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development _______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
