On 09/18/2012 02:05 PM, Thiago Macieira wrote:
>
> Interesting. We're still using 2.2, so it might be a good idea to consider
> upgrading.
>
https://bugreports.qt-project.org/browse/QTQAINFRA-466
https://codereview.qt-project.org/#admin,project,qtqa/gerrit,info
if somebody wants to give it a try
18.09.2012, 16:05, "Thiago Macieira" :
> On terça-feira, 18 de setembro de 2012 15.09.41, Konstantin Tokarev wrote:
>
>> 18.09.2012, 14:51, "Thiago Macieira" :
>>> To all developers and maintainers who have code in qtbase:
>>>
>>> It appears that the merge resolution of the second commit in qt
On terça-feira, 18 de setembro de 2012 12.06.56, liang...@nokia.com wrote:
> 9f9f3314144b54121a29c37270c73075bae2e129 is the issue commit.
Thanks Liang
That commit's message has nothing to do with half of the changes being
committed, so my guess is that it is *also* a bad merge / rebase conflict
er 18, 2012 12:51
To: development@qt-project.org
Subject: [Development] Bad merge resolution in qtbase's second commit
To all developers and maintainers who have code in qtbase:
It appears that the merge resolution of the second commit in qtbase (which is
not represented in the repository, only the
On terça-feira, 18 de setembro de 2012 15.09.41, Konstantin Tokarev wrote:
> 18.09.2012, 14:51, "Thiago Macieira" :
> > To all developers and maintainers who have code in qtbase:
> >
> > It appears that the merge resolution of the second commit in qtbase (which
> > is not represented in the reposit
18.09.2012, 14:51, "Thiago Macieira" :
> To all developers and maintainers who have code in qtbase:
>
> It appears that the merge resolution of the second commit in qtbase (which is
> not represented in the repository, only the results are) introduced a few
> regressions. So all developers workin
To all developers and maintainers who have code in qtbase:
It appears that the merge resolution of the second commit in qtbase (which is
not represented in the repository, only the results are) introduced a few
regressions. So all developers working in qtbase, please take a moment to look
at the c
