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.

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

Drop dependency on Qt Quick Controls 1 #5309

Merged
merged 1 commit into from
Jan 6, 2023

Conversation

Flowdalic
Copy link
Contributor

Qt Quick Controls 1 where deprecated with Qt 5.11 [1]. Nextcloud still depends on Quick Controls 1 by importing QtQuick.Dialogs. Removing those imports will cause the QMl script to use the according API from Quick Controls 2, which are, fortunately largely API-comptible.

This helps distribution to deprecate and remove Quick Controls 1 [2].

1: https://doc.qt.io/qt-6/qtquickcontrols-changes-qt6.html#migrating-from-qt-quick-controls-1
2: https://bugs.gentoo.org/889772

@claucambra
Copy link
Collaborator

Big thanks for your contribution, this is nice :)

@claucambra
Copy link
Collaborator

/backport to stable-3.6

Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

@mgallien mgallien force-pushed the drop-qtquickcontrols1 branch from 600ad8f to 32a92e2 Compare January 6, 2023 15:21
@codecov
Copy link

codecov bot commented Jan 6, 2023

Codecov Report

Merging #5309 (14cbd83) into master (034324d) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #5309   +/-   ##
=======================================
  Coverage   57.59%   57.59%           
=======================================
  Files         139      139           
  Lines       17631    17631           
=======================================
  Hits        10154    10154           
  Misses       7477     7477           

Qt Quick Controls 1 where deprecated with Qt 5.11 [1]. Nextcloud still
depends on Quick Controls 1 by importing QtQuick.Dialogs. Removing
those imports will cause the QMl script to use the according API from
Quick Controls 2, which are, fortunately largely API-comptible.

This helps distribution to deprecate and remove Quick Controls 1 [2].

1: https://doc.qt.io/qt-6/qtquickcontrols-changes-qt6.html#migrating-from-qt-quick-controls-1
2: https://bugs.gentoo.org/889772

Signed-off-by: Florian Schmaus <flo@geekplace.eu>
@claucambra claucambra force-pushed the drop-qtquickcontrols1 branch from 32a92e2 to 14cbd83 Compare January 6, 2023 16:22
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5309-14cbd836abe4855cb927a1d87d8a71e30b1bb81e-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@claucambra claucambra merged commit 34240e1 into nextcloud:master Jan 6, 2023
@Flowdalic Flowdalic deleted the drop-qtquickcontrols1 branch January 6, 2023 17:49
@mgallien mgallien added this to the 3.7.0 milestone Jan 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants