[Development] Merging wip/qt6 to dev
lars.knoll at qt.io
Tue Sep 17 10:03:23 CEST 2019
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).
On 17 Sep 2019, at 09:56, Simon Hausmann <Simon.Hausmann at qt.io<mailto:Simon.Hausmann at 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:
* Some MSVC 2017 configurations
* macOS 10.12, macOS 10.13
* TvOS, WatchOS
What shall we do about this? Merge the reduction also into dev?
From: Lars Knoll <lars.knoll at qt.io<mailto:lars.knoll at qt.io>>
Sent: Tuesday, September 17, 2019 9:15
To: Simon Hausmann <Simon.Hausmann at qt.io<mailto:Simon.Hausmann at qt.io>>
Cc: Qt development mailing list <development at qt-project.org<mailto:development at qt-project.org>>
Subject: Re: [Development] Merging wip/qt6 to dev
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.
On 17 Sep 2019, at 09:05, Simon Hausmann <Simon.Hausmann at qt.io<mailto:Simon.Hausmann at qt.io>> wrote:
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.
Development mailing list
Development at qt-project.org<mailto:Development at qt-project.org>
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Development