merge with qt.git#4.8

[Thomas Senyk]

Puh!

Finally done with:
1. 4.8 into experimental
2. experimental into experiemental-ro
3. experiemental-ro into experimantal


as expected 1 && 2 very quite painful :) especially because i mixed a "revert 
revert" into it :)
but 3 was extremely painless! :)


I'm doing a fresh Qt build now and afterward I'm going to push.



!!!!!! ATTENTION ATTENZIONE ATENCION ACHTUNG !!!!!!

experimental branch will do a HUGE jump:
# Your branch is ahead of 'origin/experimental' by 1498 commits.

This will most likely brake at least something :)

Anyway we need to do this sooner then later ... so as soon as my build is done 
an tested I'm going to do 'git push'

So consider your self warned :)


Greets
Thomas


On Thursday, July 07, 2011 11:14:07 AM ext BogDan wrote:
> Sorry, it was experimental-ro branch .
> BogDan.
> 
> >________________________________
> >From: "Li, LingFang" <lfli at telenav.cn>
> >To: BogDan <bog_dan_ro at yahoo.com>
> >Cc: "necessitas-devel at kde.org" <necessitas-devel at kde.org>
> >Sent: Thursday, July 7, 2011 4:45 AM
> >Subject: 答复: merge with qt.git#4.8
> >
> >Hi, BogDan
> >Which branch did you test?  Experimental-eglfs or experimental-eglfs-jw?
> >And works fine means the OpenGL example supplied by QT will run properly,
> >right?
> >
> >-----邮件原件-----
> >发件人: BogDan [mailto:bog_dan_ro at yahoo.com]
> >发送时间: 2011年7月6日 22:05
> >收件人: Thomas Senyk
> >抄送: necessitas-devel at kde.org
> >主题: Re: merge with qt.git#4.8
> >
> >Is up to you :)
> >
> >BTW I tested OpenGL on android-5 (android 2.1) and
> >android-8 (android 2.2.1) and works fine ! I think next release
> >will rock !
> >
> >Cheers,
> >BogDan.
> >
> >
> >----- Original Message -----
> >
> >> From: Thomas Senyk <thomas.senyk at nokia.com>
> >> To: BogDan <bog_dan_ro at yahoo.com>
> >> Cc: "necessitas-devel at kde.org" <necessitas-devel at kde.org>
> >> Sent: Wednesday, July 6, 2011 4:56 PM
> >> Subject: Re: merge with qt.git#4.8
> >> 
> >> Hehe :) I'm merging down-stream :)
> >> 
> >> merging order:
> >> 1. 4.8 into experimental
> >> 2. experimental into experiemental-ro
> >> 3. experiemental-ro into experimantal
> >> 
> >> 
> >> I'm not sure if it's wise to do it, but I already did 1.
> >> 2. should be painless ... I hope ;)
> >> 3. is definitly painless ... I hope
> >> 
> >> Greets
> >> Thomas
> >> 
> >> On Wednesday, July 06, 2011 03:43:24 PM ext BogDan wrote:
> >>>  Great !
> >>>  I want to do it, but you start to merge egl with experimental :)
> >>>  Are you sure you don't want to wait until the merge is finished ?
> >>>
> >>>  Cheers,
> >>>  BogDan.
> >>>
> >>>
> >>>  ----- Original Message -----
> >>>
> >>>  > From: Thomas Senyk <thomas.senyk at nokia.com>
> >>>  > To: necessitas-devel at kde.org
> >>>  > Cc:
> >>>  > Sent: Wednesday, July 6, 2011 4:34 PM
> >>>  > Subject: merge with qt.git#4.8
> >>>  >
> >>>  > Nobody has pulled from qt4.8 since may as far as I see it.
> >>>  >
> >>>  > So I did a merge with qt.git#4.8 ... I'm not 100% sure if
> >>>
> >> everything went
> >> 
> >>>  > well
> >>>  > but it looks good :)
> >>>  >
> >>>  > I think I will push it, and if it's really broken we can fix it
> >>>  > afterwards. Better fixing it afterwards then never merging with
> >>>qt4.8 > again :)
> >>>  >
> >>>  > Greets
> >>>  > Thomas
> >>>  > _______________________________________________
> >>>  > Necessitas-devel mailing list
> >>>  > Necessitas-devel at kde.org
> >>>  > https://mail.kde.org/mailman/listinfo/necessitas-devel
> >
> >_______________________________________________
> >Necessitas-devel mailing list
> >Necessitas-devel at kde.org
> >https://mail.kde.org/mailman/listinfo/necessitas-devel