Re: [Development] api_changes merged back to master

2012-04-19 Thread Kent Hansen
Den 19. april 2012 13:44, skrev ext Thiago Macieira: > On quinta-feira, 19 de abril de 2012 12.42.18, Kent Hansen wrote: >> Hi, >> qtpim is merged. Thank you. >> >> qtsystems also got merged. >> >> That leaves only qtmultimedia, I believe. This is failing: >> >> FAIL! : tst_QMediaPlaylist::loadM3u

Re: [Development] api_changes merged back to master

2012-04-19 Thread Thiago Macieira
On quinta-feira, 19 de abril de 2012 12.42.18, Kent Hansen wrote: > Hi, > qtpim is merged. Thank you. > > qtsystems also got merged. > > That leaves only qtmultimedia, I believe. This is failing: > > FAIL! : tst_QMediaPlaylist::loadM3uFile() Compared values are not the same > Actual (pl

Re: [Development] api_changes merged back to master

2012-04-19 Thread Kent Hansen
t;>Actual (cm->itemsForExport().size()): 3 >>Expected (2): 2 >>Loc: [tst_qorganizermanager.cpp(1564)] >> >> Kent >> >> >> ________ >> From: development-bounces+kent.hansen=nokia@q

Re: [Development] api_changes merged back to master

2012-04-18 Thread cristiano.di-flora
Kent > > > >From: development-bounces+kent.hansen=nokia@qt-project.org >[development-bounces+kent.hansen=nokia@qt-project.org] on behalf of >Hansen Kent (Nokia-MP/Oslo) >Sent: Wednesday, April 18, 2012 3:40 PM >To: development@qt

Re: [Development] api_changes merged back to master

2012-04-18 Thread kent.hansen
ent (Nokia-MP/Oslo) Sent: Wednesday, April 18, 2012 3:40 PM To: development@qt-project.org 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 i

Re: [Development] api_changes merged back to master

2012-04-18 Thread Kent Hansen
pment-bounces+kent.hansen=nokia@qt-project.org >> [development-bounces+kent.hansen=nokia@qt-project.org] on behalf of >> Knoll Lars (Nokia-MP/Oslo) >> Sent: Tuesday, April 17, 2012 4:52 PM >> To: development@qt-project.org >> Subject: [Development] api_changes merged bac

Re: [Development] api_changes merged back to master

2012-04-17 Thread Girish Ramakrishnan
On Tue, Apr 17, 2012 at 7:52 AM, wrote: > 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

Re: [Development] api_changes merged back to master

2012-04-17 Thread Donald Carr
en=nokia@qt-project.org > [development-bounces+kent.hansen=nokia@qt-project.org] on behalf of Knoll > Lars (Nokia-MP/Oslo) > Sent: Tuesday, April 17, 2012 4:52 PM > To: development@qt-project.org > Subject: [Development] api_changes merged back to master > > Hi eve

Re: [Development] api_changes merged back to master

2012-04-17 Thread kent.hansen
ted. Kent From: development-bounces+kent.hansen=nokia@qt-project.org [development-bounces+kent.hansen=nokia@qt-project.org] on behalf of Knoll Lars (Nokia-MP/Oslo) Sent: Tuesday, April 17, 2012 4:52 PM To: development@qt-project.org Subject: [Development] api_changes merged back

[Development] api_changes merged back to master

2012-04-17 Thread lars.knoll
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 mas