[Development] api_changes merged back to master

[Kent Hansen]

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   (playlist.media(4).canonicalUrl()): /testdir/testfile
         Expected (QUrl(QLatin1String("file:///testdir/testfile"))): 
file:///testdir/testfile

Behavorial change in QUrl, perhaps? I'm looking into it.

Kent


Den 19. april 2012 07:25, skrev Di-Flora Cristiano (Nokia-MP/Tampere):
> Hi,
>
> About qtpim issues, I can reproduce the issue and I confirm that the
> qorganizer tests are quite flacky :-/
> I am explicitly now looping in a few organizer folks who might help
> understanding what's going on in there.
> I am also planning to give a look as well during today...so let's stay in
> touch and synch up via email or IRC.
> Do you have any ideas already of what the reason for the flakiness might
> be?
>
> Br,
> -Cristiano
>
> ________________________________________
> Cristiano di Flora, PhD
>
> SW Architect / Technical lead,
>
> Nokia MP - Qt Software development
>
> Visiokatu 3
> 33720, Tampere (FINLAND)
> ________________________________________
>
>
>
>
>
>
>
>
> On 4/18/12 9:10 PM, "ext kent.hansen at nokia.com"<kent.hansen at nokia.com>
> wrote:
>
>> 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: development-bounces+kent.hansen=nokia.com at qt-project.org
>> [development-bounces+kent.hansen=nokia.com at qt-project.org] on behalf of
>> Hansen Kent (Nokia-MP/Oslo)
>> Sent: Wednesday, April 18, 2012 3:40 PM
>> To: development at 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
>> 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,<kent.hansen at nokia.com>   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: development-bounces+kent.hansen=nokia.com at qt-project.org
>>>> [development-bounces+kent.hansen=nokia.com at qt-project.org] on behalf of
>>>> Knoll Lars (Nokia-MP/Oslo)
>>>> Sent: Tuesday, April 17, 2012 4:52 PM
>>>> To: development at qt-project.org
>>>> 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
>>>> Development at qt-project.org
>>>> http://lists.qt-project.org/mailman/listinfo/development
>>>> _______________________________________________
>>>> Development mailing list
>>>> Development at qt-project.org
>>>> http://lists.qt-project.org/mailman/listinfo/development
>>>
>> _______________________________________________
>> Development mailing list
>> Development at qt-project.org
>> http://lists.qt-project.org/mailman/listinfo/development
>> _______________________________________________
>> Development mailing list
>> Development at qt-project.org
>> http://lists.qt-project.org/mailman/listinfo/development