Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-19 Thread Hirvonen Olli
ent: 19. helmikuuta 2014 18:11 > To: development@qt-project.org > Subject: Re: [Development] HEADS UP: merge stable into release and dev > into stable > > Em qua 19 fev 2014, às 16:07:11, Heikkinen Jani escreveu: > > All merges are now done and changes for Qt 5.3.0 need to

Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-19 Thread Thiago Macieira
Em qua 19 fev 2014, às 16:07:11, Heikkinen Jani escreveu: > All merges are now done and changes for Qt 5.3.0 need to be > pushed/re-targeted to the 'stable' branch from now on. Note! No new > features are allowed unless they are approved by Lars. Thanks Jani and everyone involved! -- Thiago Macie

Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-19 Thread Heikkinen Jani
Hi all! All merges are now done and changes for Qt 5.3.0 need to be pushed/re-targeted to the 'stable' branch from now on. Note! No new features are allowed unless they are approved by Lars. Changes in the current 'dev' branch will be part of the Qt 5.4.0 release. 'dev' is still blocked and op

Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-18 Thread Heikkinen Jani
From: Heikkinen Jani Sent: 17. helmikuuta 2014 9:16 To: Paaso Matti; development@qt-project.org Cc: releas...@qt-project.org Subject: RE: [Development] HEADS UP: merge stable into release and dev into stable Hi all, It seems we cannot start merge from dev branch to stable at the moment because there is

Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-17 Thread Hausmann Simon
Simon; development@qt-project.org Kopi: releas...@qt-project.org; Paaso Matti Emne: RE: [Development] HEADS UP: merge stable into release and dev into stable Hi all! I think we need to get merge done as soon as possible to make branches etc clear for everyone. That's why I propose to 1. Fina

Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-17 Thread Heikkinen Jani
Message- > From: Knoll Lars > Sent: 17. helmikuuta 2014 14:50 > To: Hausmann Simon; development@qt-project.org > Cc: Heikkinen Jani; releas...@qt-project.org; Paaso Matti > Subject: Re: [Development] HEADS UP: merge stable into release and dev > into stable > > On

Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-17 Thread Knoll Lars
On 17/02/14 13:01, "Simon Hausmann" wrote: >On Monday 17. February 2014 07.16.12 Heikkinen Jani wrote: >> Hi all, >> >> It seems we cannot start merge from dev branch to stable at the moment >> because there is still some issues to be solved before that: >> >> 1. There seems to be compilat

Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-17 Thread Frederik Gladhorn
Mandag 17. februar 2014 13.01.05 skrev Simon Hausmann: > On Monday 17. February 2014 07.16.12 Heikkinen Jani wrote: > > Hi all, > > > > It seems we cannot start merge from dev branch to stable at the moment > > because there is still some issues to be solved before that: > > > > 1. There see

Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-17 Thread Simon Hausmann
On Monday 17. February 2014 07.16.12 Heikkinen Jani wrote: > Hi all, > > It seems we cannot start merge from dev branch to stable at the moment > because there is still some issues to be solved before that: > > 1. There seems to be compilation break in dev branch, see > https://codereview.q

Re: [Development] HEADS UP: merge stable into release and dev into stable

2014-02-16 Thread Heikkinen Jani
11:52 To: development@qt-project.org Cc: releas...@qt-project.org Subject: [Development] HEADS UP: merge stable into release and dev into stable Hi, We plan to merge 'dev' branch (5.3) into stable branch on February 17th. And at the same time stable branch (5.2.2) is planned to be

[Development] HEADS UP: merge stable into release and dev into stable

2014-02-11 Thread Paaso Matti
Hi, We plan to merge 'dev' branch (5.3) into stable branch on February 17th. And at the same time stable branch (5.2.2) is planned to be merged into release branch. This means that: -If there is a need for 5.2.2 release, content will be ready in release branch. -5.3.0 release content will