Re: kio-extras and the KF5/KF6 period
Am Dienstag, 20. Juni 2023, 14:52:44 CEST schrieb David Redondo: > Harald and I prototyped another solution to build a Qt > 5 and Qt 6 version out of the same repo and employed it on > plasma-integration: https://invent.kde.org/plasma/plasma-integration/-/ > merge_requests/91 > This has the advantage of having the code for both versions in > the same place and the Qt5 version being not stuck on some old > version. Also the translations can be shared automatically since > they use the same catalog. > There is one case where Qt uses unversioned targets and one > unversioned ecm variable but cadavidn be easily worked around. And here is the same idea applied to building both Qt5 and Qt6 versions out of a single src directory at the same time. The repo is smaller and nothing duplicated so you can get a better idea of what's going on. This looks like a good option for me for repos with little divergence between both versions. https://invent.kde.org/plasma/kwayland-integration/-/merge_requests/45 David
Re: kio-extras and the KF5/KF6 period
Am Mittwoch, 21. Juni 2023, 12:31:47 CEST schrieb Ben Cooksley: > It sounds like we are approaching (or have already hit) a "crossroads" > where it is time for the Qt 5 codebase to enter a stable release only > phase, with master becoming Qt 6 exclusive. > Splitting the code into separate Qt 5 / Qt 6 folders sounds like it will be > difficult to ensure that all bug fixes are applied equally to both sides. You are right, that's why in general for Plasma projects the master branch is Qt6 only. But for some special projects we need to have Qt 5 AND Qt 6 builds in a Plasma 6 session to support Qt5 apps on Plasma 6 - for example Breeze or plasma- integration (our QPlatformTheme). Freezing Qt5 at a stable version doesn't work quite here as development happening on master will lead to UX and visual divergence compared to the frozen branch. > Cheers, > Ben David
Re: kio-extras and the KF5/KF6 period
On Wed, Jun 21, 2023 at 8:22 PM Harald Sitter wrote: > On Tue, Jun 20, 2023 at 11:23 PM Sune Vuorela wrote: > > > > On 2023-06-20, David Redondo wrote: > > > Harald and I prototyped another solution to build a Qt > > > 5 and Qt 6 version out of the same repo and employed it on > > > plasma-integration: > https://invent.kde.org/plasma/plasma-integration/-/ > > > merge_requests/91 > > > > Did I miss something or is this just branching but without having git to > > help us move stuff between versions? > > Yes but no. If we have two branches we also need two tars and everyone > needs to do two things. If we have everything in the same branch then > everything is as usual. Also, the sources are so divergent that > picking is bound to be annoying. > It sounds like we are approaching (or have already hit) a "crossroads" where it is time for the Qt 5 codebase to enter a stable release only phase, with master becoming Qt 6 exclusive. Splitting the code into separate Qt 5 / Qt 6 folders sounds like it will be difficult to ensure that all bug fixes are applied equally to both sides. > > HS > Cheers, Ben
Re: kio-extras and the KF5/KF6 period
On Tue, Jun 20, 2023 at 11:23 PM Sune Vuorela wrote: > > On 2023-06-20, David Redondo wrote: > > Harald and I prototyped another solution to build a Qt > > 5 and Qt 6 version out of the same repo and employed it on > > plasma-integration: https://invent.kde.org/plasma/plasma-integration/-/ > > merge_requests/91 > > Did I miss something or is this just branching but without having git to > help us move stuff between versions? Yes but no. If we have two branches we also need two tars and everyone needs to do two things. If we have everything in the same branch then everything is as usual. Also, the sources are so divergent that picking is bound to be annoying. HS
