merge with qt.git#4.8

[Thomas Senyk]

Hmmm it's kind of messed-up

I hope nobody (I know) will ever look at our history ...

MouseInput is not working anymore ...
I pushed anyway.

I'll take a look tomorrow and try to fix it :)

I've to go now.

Greets
Thomas


On Wednesday, July 06, 2011 04:04:51 PM ext BogDan wrote:
> 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