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

Jump to bottom

qtikz: fix build #58459

Merged
merged 1 commit into from Mar 28, 2019
Merged

qtikz: fix build #58459

merged 1 commit into from Mar 28, 2019

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Mar 27, 2019

Motivation for this change

#56826, please backport.

qcollectiongenerator was merged into qhelpgenerator in qt 5.12,
see https://blog.qt.io/blog/2018/11/02/whats-new-qt-help/

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@xeji
qtikz: fix build
0b8d40a 
qcollectiongenerator was merged into qhelpgenerator in qt 5.12,
see https://blog.qt.io/blog/2018/11/02/whats-new-qt-help/
@infinisil infinisil merged commit 32d67ef into NixOS:master Mar 28, 2019
@infinisil
Copy link
Member

infinisil commented Mar 28, 2019 •
edited

Backported to 19.03 in 26c8ce0
Backport to 18.09 not necessary

@xeji xeji deleted the p/qtikz branch March 30, 2019 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@xeji @infinisil @GrahamcOfBorg