Hi! wip/qt6 branch has been closed. Like Simon said, please retarget or abandon your changes that target that branch.
You can move your change to target a different branch on the change page in Gerrit. From the upper right corner click the three dots and then "Move change". On 10/11/19 12:55 PM, Simon Hausmann wrote: > Hi, > > Finally all changes from wip/qt6 have been merged into dev for all > modules. I've filed QTQAINFRA-3273 for the Gerrit admins to close the > branch. There are still open pending changes in some repos, please take > a look at > > https://codereview.qt-project.org/q/owner:self+branch:wip/qt6+status:open > > to see if you have any pending changes that need to be re-targeted or > abandoned. > > The dependencies.yaml propagation is almost through, webengine and > webview are pending. > > Simon > ------------------------------------------------------------------------ > *From:* Simon Hausmann <simon.hausm...@qt.io> > *Sent:* Wednesday, October 2, 2019 15:57 > *To:* Qt development mailing list <development@qt-project.org> > *Subject:* Re: [Development] Merging wip/qt6 to dev > Hi, > > Here's a new update on the merge of wip/qt6 to dev: > > The culprit that broke the Windows 7 tests has been identified, a fix > (revert) merged into qtbase 5.15 and merged up to dev. Unfortunately > qtdeclarative is still failling because for declarative the CI > configuration adds developer-build enabled tests on armv7 and armv8 -- > to cover issues we've had in the past in the JIT on these platforms. > That configuration will make the CI implicitly also run tests in qtbase > for armv7/armv8 with -developer-build and those are failing suddenly > (qtextmarkdownwriter). > > > > Simon > ------------------------------------------------------------------------ > *From:* Simon Hausmann <simon.hausm...@qt.io> > *Sent:* Thursday, September 26, 2019 13:07 > *To:* Qt development mailing list <development@qt-project.org> > *Subject:* Re: [Development] Merging wip/qt6 to dev > Hi, > > Brief update on the status of the merge: > > After qtbase, the direct leaf modules such as qtsvg, qtimageformats, > etc. were merged. What's left is qtdeclarative and everything that > depends on it. While the actual merge of wip/qt6 went through for > qtdeclarative, the combination of current dev qtbase and declarative > produce several failing tests on Windows 7. This is tracked > in QTBUG-78742 and I haven't found out yet what change in qtbase causes > the failures on Windows ;(. Initially I thought of excluding just the > one failing test, but as there are several failing tests this indicates > that something is quite broken. > > > Simon > ------------------------------------------------------------------------ > *From:* Simon Hausmann <simon.hausm...@qt.io> > *Sent:* Wednesday, September 18, 2019 11:47 > *To:* Lars Knoll <lars.kn...@qt.io> > *Cc:* Qt development mailing list <development@qt-project.org> > *Subject:* Re: [Development] Merging wip/qt6 to dev > Hi, > > Okay, qt5's dev branch has now a slightly reduced configuration set and > qtbase wip/qt6 was merged to dev. So qtbase dev now has QT_VERSION set > to 6.0.0. > > From this point on, I'll try to drive the merges and updates of the > remaining modules using the new module pinning. > > Simon > ------------------------------------------------------------------------ > *From:* Lars Knoll <lars.kn...@qt.io> > *Sent:* Tuesday, September 17, 2019 10:03 > *To:* Simon Hausmann <simon.hausm...@qt.io> > *Cc:* Qt development mailing list <development@qt-project.org> > *Subject:* Re: [Development] Merging wip/qt6 to dev > I’d say yes, let’s merge those into dev as well. Those are all platforms > we don’t want to support in Qt 6.0. (tvOS, watchOS and Integrity might > come back at some point). > > Cheers, > Lars > >> On 17 Sep 2019, at 09:56, Simon Hausmann <simon.hausm...@qt.io >> <mailto:simon.hausm...@qt.io>> wrote: >> >> >> I'm leaning towards the same. >> >> Regarding the overall merge, there is one other change that needs to >> happen before we can have a chance at building qtbase: >> >> In the wip/qt6 branch in >> commit 5677a43a25a9dc1a3151e6b28cbf9fe015a1aff4 in qt5.git, various >> platforms and configurations were removed from the CI: >> >> * MSVC2015 >> * Some MSVC 2017 configurations >> * macOS 10.12, macOS 10.13 >> * TvOS, WatchOS >> * Integrity >> >> >> What shall we do about this? Merge the reduction also into dev? >> >> >> Simon >> ------------------------------------------------------------------------ >> *From:*Lars Knoll <lars.kn...@qt.io <mailto:lars.kn...@qt.io>> >> *Sent:*Tuesday, September 17, 2019 9:15 >> *To:*Simon Hausmann <simon.hausm...@qt.io <mailto:simon.hausm...@qt.io>> >> *Cc:*Qt development mailing list <development@qt-project.org >> <mailto:development@qt-project.org>> >> *Subject:*Re: [Development] Merging wip/qt6 to dev >> Hi, >> >> Great to get the wip/qt6 branches merged back into dev. I’d simply try >> to take the dependencies.yaml into use at the same time instead of >> having to work around the CI. >> >> Cheers, >> Lars >> >>> On 17 Sep 2019, at 09:05, Simon Hausmann <simon.hausm...@qt.io >>> <mailto:simon.hausm...@qt.io>> wrote: >>> >>> Hi, >>> >>> Now that the Qt 5.15 branches exist and dev is intended to become Qt >>> 6.0.0, the time has come to begin merging the wip/qt6 branches into >>> dev. A wip/qt6 branch has been created for pretty much all >>> repositories in qt6.git that are active (essential, addon, etc.) and >>> two types of changes have been pushed into these branches: >>> >>> * Update .qmake.conf to bump the module version to 6.0.0. >>> * Compile fixes after the initial round of source incompatible >>> changes to qtbase -- most about endl, hex, etc. now always being in >>> the Qt namespace. >>> >>> qtdeclarative has seen a few more changes on the Qml side regarding >>> the module structure and loading. Those were coordinated with Ulf and >>> Fabian. >>> >>> >>> So unless somebody can think of a good reason, it is time to begin >>> merging the wip/qt6 branches to dev for each repository. This may >>> require a force push due to the dependency on a newer qtbase and the >>> newer qtbase by itself not making it through qt5. At the same time, >>> perhaps it would make more sense to add dependencies.yaml files (see >>> other email in the Qt6 and modules thread from today) while we're at it. >>> >>> >>> >>> >>> Simon >>> _______________________________________________ >>> Development mailing list >>> Development@qt-project.org <mailto:Development@qt-project.org> >>> https://lists.qt-project.org/listinfo/development > > > _______________________________________________ > Development mailing list > Development@qt-project.org > https://lists.qt-project.org/listinfo/development > -- Kari _______________________________________________ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development