Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate to Qt 6 #4584

Merged
merged 71 commits into from
Apr 26, 2024
Merged

Migrate to Qt 6 #4584

merged 71 commits into from
Apr 26, 2024

Commits on Apr 26, 2024

  1. port away from QDesktopServices::storageLocation 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    2146406 View commit details
    Browse the repository at this point in the history

  2. port away from QStringList::toSet 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    80b25d3 View commit details
    Browse the repository at this point in the history

  3. add missing Qt:: namespace when using Qt::endl 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    b712108 View commit details
    Browse the repository at this point in the history

  4. replace qrand/qsrand 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d035c26 View commit details
    Browse the repository at this point in the history

  5. port away from deprecated API from QFontMetricsF 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    20ee506 View commit details
    Browse the repository at this point in the history

  6. port away from QWidget related margines APIs 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    249e0eb View commit details
    Browse the repository at this point in the history

  7. replace deprecated QWebEngineProfile::setRequestInterceptor 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ee245f2 View commit details
    Browse the repository at this point in the history

  8. add missing QStringLiteral 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    b63c88e View commit details
    Browse the repository at this point in the history

  9. remove usage of QStringRef due to it being missing in Qt6 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    1f0279e View commit details
    Browse the repository at this point in the history

  10. disable qt apis deprecated before qt 5.12, enable warnings 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d3442d1 View commit details
    Browse the repository at this point in the history

  11. allow detection of qt5 or qt6 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    aa76de9 View commit details
    Browse the repository at this point in the history

  12. streamline find_package calls to really find Qt6 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    4566400 View commit details
    Browse the repository at this point in the history

  13. Fix macOS-specific CMake things with Qt6 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    fe7c00a View commit details
    Browse the repository at this point in the history

  14. Fix qtkeychain imports with Qt6 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    79a150b View commit details
    Browse the repository at this point in the history

  15. Remove use of QNetworkConfiguration in Qt6 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    29b0d2b View commit details
    Browse the repository at this point in the history

  16. Remove qtokenizer in favour of Qt6 QStringTokenizer 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    9932956 View commit details
    Browse the repository at this point in the history

  17. Fix type of decpoint 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    4cad9eb View commit details
    Browse the repository at this point in the history

  18. Fix QTextCodec related build issues 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    6a497cf View commit details
    Browse the repository at this point in the history

  19. Fix bad conversion to bool of shared pointer 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    366f5f0 View commit details
    Browse the repository at this point in the history

  20. Remove conflicting alias to QStringList 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ac1206a View commit details
    Browse the repository at this point in the history

  21. Add missing QStandardPaths include 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7954695 View commit details
    Browse the repository at this point in the history

  22. Add missing QActionGroup include 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    1a2db48 View commit details
    Browse the repository at this point in the history

  23. Replace now invalid '+' operator with '|' operator for QKeySequence 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    6210490 View commit details
    Browse the repository at this point in the history

  24. Replace deleted '+' operator for flags with '|' operator 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    84414ce View commit details
    Browse the repository at this point in the history

  25. Remove use of qRegisterMetatypeStreamOperators 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7e1448b View commit details
    Browse the repository at this point in the history

  26. Use QEnterEvent for new enterEvent parameters 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7a17a51 View commit details
    Browse the repository at this point in the history

  27. Replace removed progress bar option orientation with state flag 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    aaea451 View commit details
    Browse the repository at this point in the history

  28. Replace use of staticQtMetaObject with staticMetaObject 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a8e7e34 View commit details
    Browse the repository at this point in the history

  29. Remove use of QCoreApplication AA attributes 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a0e90cf View commit details
    Browse the repository at this point in the history

  30. Remove crashing QRandomGenerator seed call 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    c31e65c View commit details
    Browse the repository at this point in the history

  31. Fix QDateTime string formatting 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7e62368 View commit details
    Browse the repository at this point in the history

  32. Fix all broken QML imports 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    5087d51 View commit details
    Browse the repository at this point in the history

  33. Fix QML coloring issues 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    52758a0 View commit details
    Browse the repository at this point in the history

  34. Add separators to SyncStatus and UnifiedSearchInputContainer to stop … 

    …the scrollviews looking broken

Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3597766 View commit details
    Browse the repository at this point in the history

  35. Fix test compilation 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3765df6 View commit details
    Browse the repository at this point in the history

  36. Fix user status selector 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    5d765dd View commit details
    Browse the repository at this point in the history

  37. Remove commented out broken quick compiler check in Qt6 

    Signed-off-by: Claudio Cambra <[email protected]>
    @claucambra @mgallien
    claucambra authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    70931fb View commit details
    Browse the repository at this point in the history

  38. last step 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    e345684 View commit details
    Browse the repository at this point in the history

  39. fix automated tests with network requests 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ced85ac View commit details
    Browse the repository at this point in the history

  40. fix failing automated test that erases invalid iterator 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    274d866 View commit details
    Browse the repository at this point in the history

  41. fix automated tests missing toString() convert from QVariant 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    670b2ce View commit details
    Browse the repository at this point in the history

  42. properly use QStringView to avoid copies 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    fa766c0 View commit details
    Browse the repository at this point in the history

  43. e proper data type in data for activity model automated test data 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    09e6074 View commit details
    Browse the repository at this point in the history

  44. fix computation of timeout for jobs to have proper bounds (min < max) 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    032af80 View commit details
    Browse the repository at this point in the history

  45. only try to include qt6-keychain header and not the qt5 version 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    44f6d51 View commit details
    Browse the repository at this point in the history

  46. let appimage build script work with Qt6 based version 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    b7bba50 View commit details
    Browse the repository at this point in the history

  47. use the new CI images with Qt6 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    332f069 View commit details
    Browse the repository at this point in the history

  48. build appimage 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ced6d32 View commit details
    Browse the repository at this point in the history

  49. build image for Qt6 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    430d56e View commit details
    Browse the repository at this point in the history

  50. adapt ci checks to Qt6 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7432fb4 View commit details
    Browse the repository at this point in the history

  51. when loading translation catalog, do not ignore the return value 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    910d7f0 View commit details
    Browse the repository at this point in the history

  52. avoid warning by ignoring the return value of QtConcurrent::run 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3ad7ac9 View commit details
    Browse the repository at this point in the history

  53. fix order of init in a constructor to avoid warnings 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    4f178fa View commit details
    Browse the repository at this point in the history

  54. Signed drone.yml 

    Signed-off-by: tobiasKaminsky <[email protected]>
    @tobiasKaminsky @mgallien
    tobiasKaminsky authored and mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    8ad2a82 View commit details
    Browse the repository at this point in the history

  55. fix compilation issues after rebase 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    aae9e84 View commit details
    Browse the repository at this point in the history

  56. fix some of the qml issues 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    060181f View commit details
    Browse the repository at this point in the history

  57. use new qt 6.6.3 ci images 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7d13202 View commit details
    Browse the repository at this point in the history

  58. NetrcParser tests are known to be broken 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    82a0c1d View commit details
    Browse the repository at this point in the history

  59. header changes needed for clang/vs2022 compilers 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3099628 View commit details
    Browse the repository at this point in the history

  60. add needed namespace for declarations read by Qt metaobject system 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    9b9ff4f View commit details
    Browse the repository at this point in the history

  61. do some header includes clean-up as recommended by compiler 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a05ac62 View commit details
    Browse the repository at this point in the history

  62. add NextcloudSslCertificate to wrap QSslCertificate in QHash 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    1533670 View commit details
    Browse the repository at this point in the history

  63. fully qualify types for use with Qt metaobject system 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    20db6b6 View commit details
    Browse the repository at this point in the history

  64. fix compilation issues on windows 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    bebb8e1 View commit details
    Browse the repository at this point in the history

  65. fix compilation after rebase 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a357570 View commit details
    Browse the repository at this point in the history

  66. make it easy to find out that this branch is Qt6 based 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    2d5753c View commit details
    Browse the repository at this point in the history

  67. fix compilation of AppImage packages 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    794db30 View commit details
    Browse the repository at this point in the history

  68. use the correct Qt6 build in newer CI images 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    5bed41a View commit details
    Browse the repository at this point in the history

  69. fix build issue after rebase 

    Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    347285b View commit details
    Browse the repository at this point in the history

  70. AppImage build tool for Qt needs to know our qml files 

    gives the path to qml files such that needed Qt qml modules are deployed
correctly inside the AppImage package

Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    07c2554 View commit details
    Browse the repository at this point in the history

  71. windows needs an explicit QML import path to be set 

    on windows qml modules are not default loaded from the install folder of the app

set it such that qml modules are imported from teh installed qml folder

Signed-off-by: Matthieu Gallien <[email protected]>
    @mgallien
    mgallien committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3770eec View commit details
    Browse the repository at this point in the history