Update to qt6 #2782

andrei-toterman · 2022-10-17T17:36:02Z

ricab · 2022-10-19T12:09:19Z

include/multipass/standard_paths.h

@@ -45,7 +45,7 @@ class StandardPaths : public Singleton<StandardPaths>
    static constexpr auto PicturesLocation = StandardLocation::PicturesLocation;
    static constexpr auto TempLocation = StandardLocation::TempLocation;
    static constexpr auto HomeLocation = StandardLocation::HomeLocation;
-    static constexpr auto DataLocation = StandardLocation::DataLocation;
+    static constexpr auto DataLocation = StandardLocation::AppDataLocation;


I understand this saves us from changing client code everywhere, but I think we should stick to what we're wrapping. These wrappers exist only for the purpose of testing and I believe we should keep them as thin and faithful to the original as possible. The moment we start mapping things differently or adding functionality, they themselves would need to be tested.

I see your point. Now that I look closer, DataLocation is not used anywhere in our code and the QStandardPaths::StandardLocation::DataLocation has been removed in favor of QStandardPaths::StandardLocation::AppDataLocation and we already have a AppDataLocation constant that wraps that value. So I guess the DataLocation can be removed entirely, right?

Oh ok, yep I think it should be removed if it is not available in the wrappee anymore.

src/daemon/daemon.cpp

src/settings/persistent_settings_handler.cpp

codecov · 2022-10-19T14:08:14Z

Codecov Report

Merging #2782 (4b92337) into main (82495d0) will decrease coverage by 0.06%.
The diff coverage is 88.88%.

@@            Coverage Diff             @@
##             main    #2782      +/-   ##
==========================================
- Coverage   88.55%   88.49%   -0.06%     
==========================================
  Files         239      239              
  Lines       12158    12111      -47     
==========================================
- Hits        10766    10718      -48     
- Misses       1392     1393       +1

Impacted Files	Coverage Δ
src/daemon/daemon.h	`100.00% <ø> (ø)`
src/network/url_downloader.cpp	`100.00% <ø> (ø)`
...rc/platform/backends/qemu/qemu_virtual_machine.cpp	`68.52% <0.00%> (ø)`
src/settings/wrapped_qsettings.h	`18.51% <ø> (+1.85%)`	⬆️
...tform/backends/libvirt/libvirt_virtual_machine.cpp	`64.00% <50.00%> (ø)`
src/daemon/daemon.cpp	`73.56% <84.21%> (-0.07%)`	⬇️
src/client/cli/argparser.cpp	`96.34% <100.00%> (-0.61%)`	⬇️
src/client/cli/cmd/launch.cpp	`87.58% <100.00%> (ø)`
src/client/cli/cmd/mount.cpp	`92.30% <100.00%> (ø)`
src/client/cli/cmd/set.cpp	`95.55% <100.00%> (ø)`
... and 8 more

... and 10 files with indirect coverage changes

townsend2010

Hey @andrei-toterman!

Thanks for this! Unfortunately, the tray icon GUI does not work for me:

$ multipass.gui 
Warning: Ignoring WAYLAND_DISPLAY on Gnome. Use QT_QPA_PLATFORM=wayland to run on Wayland anyway.
qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
qt.qpa.plugin: Could not find the Qt platform plugin "wayland" in ""
This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

Aborted (core dumped)

it was needed to set the codec to UTF-8 but that became the default in Qt6

in Qt6 overloading QProcess::setupChildProcess has been replaced with passing a function to setChildProcessModifier

in Qt6, that attribute has been removed and redirects are followed by default

in Qt6, QFuture operator== has been removed, so we can't directly compare if two QFutures are the same. now, when a QFutureWatcher is created, we create a UUID to identify it in a map

townsend2010

This fails building on the private side due to the private side change in the workflow.

I'm gonna bors this to get the commit message, but it will fail, so I'll just merge manually.

townsend2010 · 2023-07-24T16:12:57Z

bors merge

2782: Update to qt6 r=townsend2010 a=andrei-toterman Fixes #2627 Co-authored-by: Andrei Toterman <[email protected]>

bors · 2023-07-24T22:29:51Z

Timed out.

andrei-toterman force-pushed the update-to-qt6 branch from 5a9eaa8 to 8344045 Compare October 17, 2022 17:44

andrei-toterman changed the base branch from main to update-snap-to-core22 October 18, 2022 13:33

andrei-toterman force-pushed the update-to-qt6 branch from 8344045 to e5c2138 Compare October 19, 2022 11:49

ricab reviewed Oct 19, 2022

View reviewed changes

src/daemon/daemon.cpp Show resolved Hide resolved

ricab reviewed Oct 19, 2022

View reviewed changes

src/settings/persistent_settings_handler.cpp Show resolved Hide resolved

andrei-toterman force-pushed the update-to-qt6 branch from f42f175 to e566d56 Compare October 19, 2022 13:26

andrei-toterman force-pushed the update-snap-to-core22 branch 3 times, most recently from 21a93a0 to f5b5882 Compare October 31, 2022 14:13

andrei-toterman force-pushed the update-snap-to-core22 branch 2 times, most recently from d619899 to c67e2f0 Compare October 31, 2022 18:28

andrei-toterman force-pushed the update-to-qt6 branch from e566d56 to f84579f Compare November 2, 2022 09:14

andrei-toterman force-pushed the update-snap-to-core22 branch from c67e2f0 to f6ac74d Compare January 11, 2023 12:10

andrei-toterman force-pushed the update-to-qt6 branch 3 times, most recently from b7a5696 to d66a3f4 Compare January 11, 2023 12:46

andrei-toterman marked this pull request as draft January 17, 2023 14:07

andrei-toterman marked this pull request as ready for review January 17, 2023 14:07

andrei-toterman force-pushed the update-snap-to-core22 branch from f6ac74d to db7ba86 Compare January 17, 2023 15:01

andrei-toterman force-pushed the update-to-qt6 branch 3 times, most recently from 41067f2 to 0def63d Compare January 17, 2023 19:15

townsend2010 force-pushed the update-snap-to-core22 branch from db7ba86 to b9465e0 Compare January 18, 2023 17:34

andrei-toterman force-pushed the update-snap-to-core22 branch from b9465e0 to 92d889f Compare January 20, 2023 11:01

andrei-toterman force-pushed the update-to-qt6 branch from 0def63d to 464456b Compare January 20, 2023 11:01

bors bot changed the base branch from update-snap-to-core22 to main January 25, 2023 15:57

townsend2010 suggested changes Jan 26, 2023

View reviewed changes

andrei-toterman force-pushed the update-to-qt6 branch from 464456b to 579abcc Compare January 30, 2023 15:44

townsend2010 marked this pull request as draft January 30, 2023 19:17

townsend2010 marked this pull request as ready for review January 30, 2023 19:17

townsend2010 linked an issue Feb 8, 2023 that may be closed by this pull request

Update to Qt6 #2627

Closed

townsend2010 force-pushed the update-to-qt6 branch from 579abcc to 56755cc Compare June 13, 2023 17:48

townsend2010 force-pushed the update-to-qt6 branch from 56755cc to 2997534 Compare June 26, 2023 17:22

andrei-toterman added 16 commits July 21, 2023 14:08

update cmake files to qt6

583789d

update qhotkey to qt6

7647daf

replace QRegExp with QRegularExpression

c75418a

remove setIniCodec from WrappedQSettings

b44a0b2

it was needed to set the codec to UTF-8 but that became the default in Qt6

replace QProcess setupChildProcess with setChildProcessModifier

e600dce

in Qt6 overloading QProcess::setupChildProcess has been replaced with passing a function to setChildProcessModifier

fix QString split options namespace

8d58114

fix some type inference errors

abbeddf

remove deprecated DataLocation standard path

cd79910

remove UrlDownloader FollowRedirectsAttribute

661d2dc

in Qt6, that attribute has been removed and redirects are followed by default

[daemon] store async_future_watchers as a map with UUIDs

8d73f1f

in Qt6, QFuture operator== has been removed, so we can't directly compare if two QFutures are the same. now, when a QFutureWatcher is created, we create a UUID to identify it in a map

fix QtConcurrent::run arguments

9337070

replace QNetworkReply error signal to errorOccurred

8a8636f

[snap] update to qt6

05189da

[ci] update to qt6

caee6af

update README to qt6

730e489

remove libqt5x11extras from build deps

4b92337

townsend2010 force-pushed the update-to-qt6 branch from 2997534 to 4b92337 Compare July 21, 2023 18:09

townsend2010 marked this pull request as draft July 24, 2023 13:17

townsend2010 marked this pull request as ready for review July 24, 2023 13:17

townsend2010 approved these changes Jul 24, 2023

View reviewed changes

bors bot added a commit that referenced this pull request Jul 24, 2023

Merge #2782

7c4e29d

2782: Update to qt6 r=townsend2010 a=andrei-toterman Fixes #2627 Co-authored-by: Andrei Toterman <[email protected]>

townsend2010 merged commit 77cb016 into main Jul 24, 2023
20 of 23 checks passed

bors bot deleted the update-to-qt6 branch July 24, 2023 16:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to qt6 #2782

Update to qt6 #2782

andrei-toterman commented Oct 17, 2022 •

edited by townsend2010

Loading

ricab Oct 19, 2022

andrei-toterman Oct 19, 2022

ricab Oct 19, 2022

codecov bot commented Oct 19, 2022 •

edited

Loading

townsend2010 left a comment

townsend2010 left a comment

townsend2010 commented Jul 24, 2023

bors bot commented Jul 24, 2023

Update to qt6 #2782

Update to qt6 #2782

Conversation

andrei-toterman commented Oct 17, 2022 • edited by townsend2010 Loading

ricab Oct 19, 2022

Choose a reason for hiding this comment

andrei-toterman Oct 19, 2022

Choose a reason for hiding this comment

ricab Oct 19, 2022

Choose a reason for hiding this comment

codecov bot commented Oct 19, 2022 • edited Loading

Codecov Report

townsend2010 left a comment

Choose a reason for hiding this comment

townsend2010 left a comment

Choose a reason for hiding this comment

townsend2010 commented Jul 24, 2023

bors bot commented Jul 24, 2023

andrei-toterman commented Oct 17, 2022 •

edited by townsend2010

Loading

codecov bot commented Oct 19, 2022 •

edited

Loading