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

qtdeclarative: revert "Patch for scrollbar regression" #96248

Merged
2 commits merged into from Aug 25, 2020
Merged

Conversation

peti
Copy link
Member

@peti peti commented Aug 25, 2020

This reverts commit 5530043. The change breaks the build of
qtquickcontrols. Fixes #96159.

This reverts commit 5530043. The change breaks the build of
qtquickcontrols. Fixes NixOS#96159.
@peti
Copy link
Member Author

peti commented Aug 25, 2020

@GrahamcOfBorg build qt5.qtquickcontrols

@ofborg ofborg bot requested a review from ehmry August 25, 2020 08:53
@ghost
Copy link

ghost commented Aug 25, 2020

Thanks for discovering that this patch broke the build! I can confirm that qt5.qtquickcontrols builds fine now. But did you maybe push the picard update to the same branch by accident?

Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Builds for me. A visual fix doesn't seem worth the regression, though perhaps someone would be able to resolve it (later) in a better way than dropping the patch.

EDIT: the picard change seems non-controversial, so it shouldn't block merging.

@ghost ghost merged commit 7b52722 into NixOS:master Aug 25, 2020
@peti
Copy link
Member Author

peti commented Aug 25, 2020

Oops, yes, I pushed that Picard update here by mistake. Will fix that in a second... The patch is in master already anyway.

@peti
Copy link
Member Author

peti commented Aug 25, 2020

Ah, you were faster. Thanks a lot for merging. I'm glad master builds for me again.

This pull request was closed.
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.

qtquickcontrols is blocking channels
3 participants