[Development] Development Digest, Vol 15, Issue 3
haithem rahmani
haithem.rahmani at gmail.com
Sun Dec 2 16:04:16 CET 2012
Hi,
I did :
$> git submodule foreach "git checkout -b stable remotes/origin/stable"
and got the error:
fatal: git checkout: updating paths is incompatible with switching branches.
Did you intend to checkout 'remotes/origin/stable' which can not be
resolved as commit?
Stopping at 'qtqa'; script returned non-zero status.
there is not stable branch for the "qtqa" module.
regards
On Sun, Dec 2, 2012 at 12:00 PM, <development-request at qt-project.org> wrote:
> Send Development mailing list submissions to
> development at qt-project.org
>
> To subscribe or unsubscribe via the World Wide Web, visit
> http://lists.qt-project.org/mailman/listinfo/development
> or, via email, send a message with subject or body 'help' to
> development-request at qt-project.org
>
> You can reach the person managing the list at
> development-owner at qt-project.org
>
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of Development digest..."
>
>
> Today's Topics:
>
> 1. Re: Branching 5.0 (Ahumada Sergio)
> 2. Re: Branching 5.0 (Thiago Macieira)
> 3. Re: The final mile (Thiago Macieira)
> 4. a question about Qt for Symbian (Qi Liang)
> 5. Re: The final mile (Koehne Kai)
>
>
> ----------------------------------------------------------------------
>
> Message: 1
> Date: Sat, 1 Dec 2012 16:13:55 +0000
> From: Ahumada Sergio <Sergio.Ahumada at digia.com>
> Subject: Re: [Development] Branching 5.0
> To: "<development at qt-project.org>" <development at qt-project.org>
> Message-ID:
> <9B4D1DADF5006F4DB6666312421B98E5F0348F at IT-EXMB01-HKI.it.local>
> Content-Type: text/plain; charset="Windows-1252"
>
> Hi,
>
> > ? this time for real? :)
>
> The branching has been finished for the following projects:
>
> - qt5
> - qtactiveqt
> - qtbase
> - qtdeclarative
> - qtdoc
> - qtgraphicaleffects
> - qtimageformats
> - qtjsbackend
> - qtmultimedia
> - qtquick1
> - qtscript
> - qtsvg
> - qttools
> - qttranslations
> - qtwebkit
> - qtwebkit-examples-and-demos
> - qtxmlpatterns
>
> and one additional request for qtsensors.
>
> What has happened is:
>
> * "master" is blocked for new pushes
> If you try, you should get an error like:
> To ssh://codereview.qt-project.org/qt/qt<module>.git
> ! [remote rejected] HEAD -> refs/for/master (prohibited by Gerrit)
>
> note: pending changes can still be staged but I think it's better to
> re-push them to "dev" / "stable"
>
> * "dev" was created out of master
>
> * "stable" was created out of master
>
> If you find something that does not work as it should, please let us know.
>
> Cheers,
> --
> Sergio Ahumada
> Release Engineer - Digia, Qt
>
> ------------------------------
>
> Message: 2
> Date: Sat, 01 Dec 2012 11:20:48 -0800
> From: Thiago Macieira <thiago.macieira at intel.com>
> Subject: Re: [Development] Branching 5.0
> To: development at qt-project.org
> Message-ID: <9608092.3Zde0NSOgA at tjmaciei-mobl2>
> Content-Type: text/plain; charset="us-ascii"
>
> On quarta-feira, 28 de novembro de 2012 19.47.47, Knoll Lars wrote:
> > Transitional only. Will be closed for new pushes once the branches get
> > created. Patches that are already in gerrit can still be staged for
> around
> > a week to allow everybody to stage their pending changes. Master will
> then
> > get merged to dev, and we will then completely close master.
>
> Did you really mean "merged to dev" ?
>
> Most of the pending changes in master today are fixes that need to go into
> the
> 5.0 release, so the branch should be merged to stable, not dev.
>
> --
> Thiago Macieira - thiago.macieira (AT) intel.com
> Software Architect - Intel Open Source Technology Center
> -------------- next part --------------
> A non-text attachment was scrubbed...
> Name: not available
> Type: application/pgp-signature
> Size: 190 bytes
> Desc: This is a digitally signed message part.
> Url :
> http://lists.qt-project.org/pipermail/development/attachments/20121201/1fa1be55/attachment-0001.bin
>
> ------------------------------
>
> Message: 3
> Date: Sat, 01 Dec 2012 13:18:01 -0800
> From: Thiago Macieira <thiago.macieira at intel.com>
> Subject: Re: [Development] The final mile
> To: development at qt-project.org
> Message-ID: <2313749.k3ljvY4Gnb at tjmaciei-mobl2>
> Content-Type: text/plain; charset="us-ascii"
>
> On segunda-feira, 19 de novembro de 2012 20.09.35, Knoll Lars wrote:
> > * WebKit library split (WebKit + WebKitWidgets)
> >
> > This is a binary incompatible change, that has to go in for 5.0. Most of
> the
> > QtWebKit team is working on this, and I have good confidence that the
> > change will be and done in some time next week.
>
> This has apparently created source-incompatible changes which broke the
> package generation today.
>
> Can someone post a summary of the targetted final state?
>
> If this is introducing major source incompatible changes, I'm going to
> request
> a new beta instead of an RC.
> --
> Thiago Macieira - thiago.macieira (AT) intel.com
> Software Architect - Intel Open Source Technology Center
> -------------- next part --------------
> A non-text attachment was scrubbed...
> Name: not available
> Type: application/pgp-signature
> Size: 190 bytes
> Desc: This is a digitally signed message part.
> Url :
> http://lists.qt-project.org/pipermail/development/attachments/20121201/28febe42/attachment-0001.bin
>
> ------------------------------
>
> Message: 4
> Date: Sat, 1 Dec 2012 21:22:22 +0000
> From: Qi Liang <Liang.Qi at digia.com>
> Subject: [Development] a question about Qt for Symbian
> To: "development at qt-project.org" <development at qt-project.org>
> Message-ID:
> <D475EEC9582CD5409449ED31FA16C3303C64A5 at IT-EXMB01-HKI.it.local>
> Content-Type: text/plain; charset="us-ascii"
>
> Hi, all,
>
> 5.0 branching is almost finished this weekend.
>
> And I just started to go through "Not Evaluated" items in jira(
> https://bugreports.qt-project.org/) last night. I found there are still
> about less than 300 tasks in open/reported status. I tried "git log
> --grep="symbian" --regexp-ignore-case" in qt/qt and found last commit is
> about Nov. 30, 2011, it's totally 1 year ago.
>
> Is there any one still working on Qt for Symbian in 4.x? Or responsible
> for them. If not, I plan to close those Symbian tasks in jira.(If someone
> works on one of them, could re-open it again.)
>
> If no one objects this in a week, I will do then.
>
> And maybe we should list Symbian into unsupported platforms for Qt 4.8 and
> later. At least current CI doesn't cover it.
>
> Regards,
> Liang
>
>
> ------------------------------
>
> Message: 5
> Date: Sat, 1 Dec 2012 23:20:37 +0000
> From: Koehne Kai <Kai.Koehne at digia.com>
> Subject: Re: [Development] The final mile
> To: Thiago Macieira <thiago.macieira at intel.com>,
> "development at qt-project.org" <development at qt-project.org>
> Message-ID:
> <5B2736A3C8B75B4BB66BC58DC5E889B082599E at IT-EXMB01-HKI.it.local>
> Content-Type: text/plain; charset="us-ascii"
>
>
> > From: development-bounces+kai.koehne=digia.com at qt-project.org[development-bounces+kai.koehne=
> digia.com at qt-project.org] on behalf of Thiago Macieira [
> thiago.macieira at intel.com]
> >> On segunda-feira, 19 de novembro de 2012 20.09.35, Knoll Lars wrote:
> >> * WebKit library split (WebKit + WebKitWidgets)
> >>
> >> This is a binary incompatible change, that has to go in for 5.0. Most
> of the
> >> QtWebKit team is working on this, and I have good confidence that the
> >> change will be and done in some time next week.
> >
> > This has apparently created source-incompatible changes which broke the
> > package generation today.
>
> Just to clarify this a bit, we had a build failure of qt-creator today in
> the qt-sdk packaging process where the compiler failed to find a
> "QWebSettings" include, although the .pro file did include "QT +=
> webkitwidgets". The compiler call did actually contain
> -Iinclude/QtWebKitWidgets, but not -Iinclude/QtWebKit. This AFAIK only
> happened on Mac, and we're not yet sure what's the root cause (and whether
> it's a general Qt problem, or a problem with the way we compile Qt Creator
> / patch Qt on the build machines, which is a bit special ...).
>
> Regards
>
> Kai
>
> PS: I pushed a fix that hopefully works around the issue by explicitly
> adding "QT+=webkit". So if anybody wants to give it a try locally, first
> revert https://codereview.qt-project.org/#change,41469 in qt-creator.
>
> > Can someone post a summary of the targetted final state?
> >
> > If this is introducing major source incompatible changes, I'm going to
> request
> > a new beta instead of an RC.
>
>
> ------------------------------
>
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
>
>
> End of Development Digest, Vol 15, Issue 3
> ******************************************
>
--
*
Never say that's "impossible", the word itself says "I'm Possible"
*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/development/attachments/20121202/6f208e8d/attachment.html>
More information about the Development
mailing list