[Development] Merging wip/qt6 to dev

Lars Knoll lars.knoll at qt.io
Tue Sep 17 09:15:15 CEST 2019


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...
URL: <http://lists.qt-project.org/pipermail/development/attachments/20190917/7fc92b40/attachment.html>

More information about the Development mailing list