Re: [Development] Merging qtquickcontrols2 into qtdeclarative

2021-07-12 Thread Thiago Macieira
On Monday, 12 July 2021 14:22:54 PDT Elvis Stansvik wrote: > Personally I'm always frustrated when I hit a dead end during git > blame. Even if the original repo will be kept around, it's an added > obstacle. And at some point, I'm sure it will no longer be available. Yup, very often you do a git

Re: [Development] Merging qtquickcontrols2 into qtdeclarative

2021-07-12 Thread Elvis Stansvik
Den mån 12 juli 2021 kl 22:45 skrev Tor Arne Vestbø : > > > > > On 12 Jul 2021, at 21:19, Thiago Macieira wrote: > > So a full history import MAY have negligible marginal impact over a squashed > import (.git is compressed). I recommend trying both and seeing by how much > the qtdeclarative reposi

Re: [Development] Merging qtquickcontrols2 into qtdeclarative

2021-07-12 Thread Tor Arne Vestbø
On 12 Jul 2021, at 21:19, Thiago Macieira mailto:thiago.macie...@intel.com>> wrote: So a full history import MAY have negligible marginal impact over a squashed import (.git is compressed). I recommend trying both and seeing by how much the qtdeclarative repository increases, then deciding whe

Re: [Development] Merging qtquickcontrols2 into qtdeclarative

2021-07-12 Thread Thiago Macieira
On Monday, 12 July 2021 08:03:48 PDT Oswald Buddenhagen wrote: > that would avoid duplicating the history, which would make the repo > somewhat smaller and leave us with only one authoritative copy of said > history (the original module will have to stay around for quite a while > and keep receivin

Re: [Development] Merging qtquickcontrols2 into qtdeclarative

2021-07-12 Thread Tor Arne Vestbø
On 12 Jul 2021, at 17:03, Oswald Buddenhagen mailto:oswald.buddenha...@gmx.de>> wrote: On Mon, Jul 12, 2021 at 02:17:01PM +, Tor Arne Vestbø wrote: One way to do this is with a prefixed subtree merge without squashing the history of controls2. What ossi (?) referred to was using git repl

Re: [Development] Merging qtquickcontrols2 into qtdeclarative

2021-07-12 Thread Oswald Buddenhagen
On Mon, Jul 12, 2021 at 02:17:01PM +, Tor Arne Vestbø wrote: One way to do this is with a prefixed subtree merge without squashing the history of controls2. What ossi (?) referred to was using git replace to inject the history of controls, but I’m not sure how that would look so perhaps he

Re: [Development] Merging qtquickcontrols2 into qtdeclarative

2021-07-12 Thread Mitch Curtis
Thanks Tor Arne. Can you elaborate a bit on the commands used for a prefixed subtree merge? Or point to a page that explains it? From: Tor Arne Vestbø Sent: Monday, 12 July 2021 4:17 PM To: Mitch Curtis Cc: development@qt-project.org Subject: Re: [Development] Merging qtquickcontrols2 into qtde

Re: [Development] Merging qtquickcontrols2 into qtdeclarative

2021-07-12 Thread Tor Arne Vestbø
One way to do this is with a prefixed subtree merge without squashing the history of controls2. What ossi (?) referred to was using git replace to inject the history of controls, but I’m not sure how that would look so perhaps he can outline that approach. Cheers, Tor Arne On 12 Jul 2021, at

[Development] Merging qtquickcontrols2 into qtdeclarative

2021-07-12 Thread Mitch Curtis
Hi. The consensus from the contributor's summit session regarding https://bugreports.qt.io/browse/QTBUG-79454 was that qtquickcontrols2 should be merged into qtdeclarative: https://wiki.qt.io/QtCS2021_-_Testing_upstream_changes_with_downstream_modules#Move_specific_modules_into_the_repository_o

[Development] Nominating Kaj Grönholm as approver

2021-07-12 Thread Volker Hilsheimer
Hi, I’d like to nominate Kaj Grönholm as an approver for the Qt Project. Kaj has been working primarily on Qt 3D Studio and Qt Quick 3D, most recently on the particle effects support in Qt 6. He has authored the following patches: https://codereview.qt-project.org/q/owner:kaj.gronholm%2540qt.

Re: [Development] Nominating Ivan Solovev as approver

2021-07-12 Thread Alex Blasche
Congratulations to Ivan. Approver rights have been granted. -- Alex > -Original Message- > From: Development On Behalf Of Alex > Blasche > Sent: Tuesday, 15 June 2021 13:18 > To: development@qt-project.org > Subject: [Development] Nominating Ivan Solovev as approver > > Hi, > > I'd lik

Re: [Development] Nominating Aleksei German as aproover

2021-07-12 Thread Alex Blasche
Congratulations to Aleksei. Approver rights have been granted. -- Alex > -Original Message- > From: Development On Behalf Of > Thomas Hartmann > Sent: Monday, 14 June 2021 12:27 > To: development@qt-project.org > Subject: [Development] Nominating Aleksei German as aproover > > Hi all, >

Re: [Development] Nominating Knud Dollereder as approver

2021-07-12 Thread Alex Blasche
Congratulations to Knud. Approver rights have been granted. -- Alex > -Original Message- > From: Development On Behalf Of > Thomas Hartmann > Sent: Monday, 14 June 2021 12:21 > To: development@qt-project.org > Subject: [Development] Nominating Knud Dollereder as approver > > Hi all, >

Re: [Development] Nominating Henning Gründl as approver

2021-07-12 Thread Alex Blasche
Congratulations to Henning. Approver rights have been granted. -- Alex > -Original Message- > From: Development On Behalf Of > Thomas Hartmann > Sent: Monday, 14 June 2021 12:30 > To: development@qt-project.org > Subject: [Development] Nominating Henning Gründl as approver > > Hi all, >