[Development] Multitouch on top of XInput 2.2

Christian Spielberger c.spielberger at bct-electronic.com
Wed Jul 25 17:29:47 CEST 2012


On 07/09/2012 07:42 PM, Shawn Rutledge wrote:
> On Thursday wk26 2012 June 28 05:09:41 PM ext Shawn Rutledge wrote:
>> On 28 June 2012 13:03, Christian Spielberger
>>
>> <c.spielberger at bct-electronic.com> wrote:
>>> Hi,
>>>
>>> I got multitouch on top of XInput 2.2 to work.
>>>
>>> See http://www.youtube.com/watch?v=sRSC4CEYmIg !
>>>
>>> Repo:
>>> See https://gitorious.org/~cspiel/qt/cspiels-qt-4_8-with-xinput2_1 !
>>>
>>> Branch:
>>> 4.8-XI2.2-touch
>>>
>>> Maybe the branch can be the base for the multitouch integration for X11.
>>
>> Excellent!  I was planning to work on Qt 5 support for XI 2.2 soon, so
>> that should be helpful.
>
> However due to the way the code has been rearranged, the patch will be in
> different files anyway.  Would you like to convert your changes into a patch
> on gerrit so it can be reviewed to go into 4.8.x?  I can also test it
> on a couple of devices.
>
> My patch for Qt 5 is here:
>
> https://codereview.qt-project.org/#change,30469
>

Hi Shawn,

I tried to commit my branch to gerrit following this procedure.


1. Made a new branch from current 4.8 which rests here:
https://qt.gitorious.org/~cspiel/qt/cspiels-qt-4_8-with-xinput2_1/commits/4.8-XI2.2

2. Merged with
git://gitorious.org/+qt-developers/qt/multipoint-touch.git branch 
refs/heads/master

3. Applied my changes with git cherry-pick.

4. Set up the gerrit account. In my .git/config I have:
[remote "gerrit"]
	url = cspiel at codereview.qt-project.org:qt/qt
	fetch = +refs/heads/*:refs/remotes/gerrit/*
[branch "gerrit_4.8"]
	remote = gerrit
	merge = refs/for/4.8

5. Changed to gerrit_4.8 locally and merged with 4.8-XI2.2

6. git push gives:

$ git push
Counting objects: 422, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (133/133), done.
Writing objects: 100% (377/377), 62.46 KiB, done.
Total 377 (delta 317), reused 269 (delta 244)
remote: Resolving deltas:  14% (45/317)
remote:
remote: ERROR:  In commit 408021665e7a6b393b9aad3b911411ca02f7186b
remote: ERROR:  committer email address thiago.macieira at nokia.com
remote: ERROR:  does not match your user account.
remote: ERROR:
remote: ERROR:  The following addresses are currently registered:
remote: ERROR:    c.spielberger at bct-electronic.com
remote: ERROR:
remote: ERROR:  To register an email address, please visit:
remote: ERROR:  https://codereview.qt-project.org/#settings,contact
remote:
remote:
To cspiel at codereview.qt-project.org:qt/qt
  ! [remote rejected] gerrit_4.8 -> refs/for/4.8 (invalid committer)
error: failed to push some refs to 'cspiel at codereview.qt-project.org:qt/qt'

Which makes sense since the commit 408021665 is originally from repo 
multipoint-touch.git. This commit is from Bradley T. Hughes 
<bradley.hughes at nokia.com>. So the email addr thiago.macieira at nokia.com 
makes no sense, but it makes sense that I can not submit this to gerrit.

What I want is to suggest the changes in the multipoint-touch.git repo 
plus my changes to be reviewed/merged into 4.8 mainline. How such a 
situation should be handled (with gerrit)?


regards,
chris.



More information about the Development mailing list