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

Add Qt5 static missing dependencies, fix mac packages #5680

Merged
merged 11 commits into from
Mar 26, 2019

Conversation

seanwarren
Copy link
Contributor

This PR

  • Adds missing dependencies for a qt5 static build on windows or mac
  • Fixes qscintilla build on x64-osx and x64-windows-static
  • Fixes libqglviewer build on x64-osx
  • Fixes cutelyst2 build on x64-osx

@Rastaban
Copy link
Contributor

Here are the current results, let us know if you need any logs.

Processing arm-uwp                        415 vs 415
     qt5-macextras                                               Skip vs 
 Processing arm64-windows                  474 vs 474
     qt5-macextras                                               Skip vs 
 Processing x64-linux                      635 vs 635
     qt5-macextras                                               Fail vs 
     qt5-purchasing                                              Skip vs Fail
 Processing x64-osx                        632 vs 630
     qscintilla                                                  Pass vs Fail
     qt5-macextras                                               Pass vs 
     qt5-purchasing                                              Skip vs Fail
 Processing x64-uwp                        444 vs 444
     qt5-macextras                                               Skip vs 
 Processing x64-windows                    889 vs 891
     libqglviewer                  **regression**                Fail vs Pass
     qscintilla                    **regression**                Fail vs Pass
     qt5-macextras                                               Fail vs 
 Processing x64-windows-static             787 vs 786
     cutelyst2                                                   Pass vs Fail
     libqglviewer                                                Pass vs Fail
     qscintilla                    **regression**                Fail vs Pass
     qt5-macextras                                               Fail vs 
     qt5-purchasing                                              Skip vs Fail
 Processing x86-windows                    868 vs 870
     libqglviewer                  **regression**                Fail vs Pass
     qscintilla                    **regression**                Fail vs Pass
     qt5-macextras                                               Fail vs 

@seanwarren
Copy link
Contributor Author

Please could you send the logs for qscintilla:x64-windows-static

ports/qt5/CONTROL Outdated Show resolved Hide resolved
@Rastaban
Copy link
Contributor

it doesen't look like you need to qscintilla logs anymore. The only reason for the red X is the new port qt5-macextras port is only passing on Mac, but that looks by design so its okay.

Processing arm-uwp                        415 vs 415
    qt5-macextras                                               Skip vs 
Processing arm64-windows                  474 vs 474
    qt5-macextras                                               Skip vs 
Processing x64-linux                      637 vs 637
    qt5-macextras                                               Fail vs 
    qt5-purchasing                                              Skip vs Fail
Processing x64-osx                        634 vs 632
    qscintilla                                                  Pass vs Fail
    qt5-macextras                                               Pass vs 
    qt5-purchasing                                              Skip vs Fail
Processing x64-uwp                        444 vs 444
    qt5-macextras                                               Skip vs 
Processing x64-windows                    891 vs 891
    qt5-macextras                                               Fail vs 
Processing x64-windows-static             786 vs 784
    cutelyst2                                                   Pass vs Fail
    libqglviewer                                                Pass vs Fail
    qt5-macextras                                               Fail vs 
    qt5-purchasing                                              Skip vs Fail
Processing x86-windows                    870 vs 870
    qt5-macextras                                               Fail vs 

@seanwarren
Copy link
Contributor Author

Hello, is anything else required for this PR from my end?
Cheers, Sean

@Rastaban Rastaban self-assigned this Mar 26, 2019
@Rastaban
Copy link
Contributor

Resolved merge conflicts, if the tests are good then I should be able to merge.

@Rastaban Rastaban merged commit 98ae960 into microsoft:master Mar 26, 2019
@seanwarren seanwarren deleted the fix-qt5-static-link branch March 27, 2019 04:43
@dantti
Copy link
Contributor

dantti commented Jun 20, 2019

This PULL removes Cutelyst2 .dll files on Windows making it useless, I'm not sure how to fix the build on Mac and not break it on Windows :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants