-
Notifications
You must be signed in to change notification settings - Fork 6.7k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
[qt5-base, qt5-imageformat] fix issues on osx #9705
Conversation
This reverts commit 8b9b188.
Seems some ports can be successfully built, but some ports are broken. |
I'll fix the remaining regressions when i got the time for it. I already know how to fix those due to my local second paraview branch with qt 5.14 but have to apply those changes to Qt 5.12 |
Ah nice .... wt has a silent dependency on Qt5 .... |
qt5-base no longer builds angle so there is no conflict there. |
@JackBoosY: Should we jump directly to #10009 if possible. I just split the PRs up because I thought the fixes would land faster in master. (And i didn't now when i will finish them.) |
@Neumann-A Okay, that's ok. |
/azp run |
Pull request contains merge conflicts. |
...... ah really i should not use the github merge tool anymore. It seems to completely replace the file all the time.... |
# Conflicts: # scripts/ci.baseline.txt
Retesting... |
Hi All,
To test, I did the following:
This resulted in the build failure above. |
@heydojo: |
Hi @Neumann-A, please resolve baseline conflicts. Thanks. |
@Neumann-A Thanks. Please disregard my message regarding the patches here. I did try your 5.14.1 branch and will test the 5.14.2 branch you have with the qtmain.lib fix #10644 |
# Conflicts: # scripts/ci.baseline.txt
# Conflicts: # ports/qt5-base/portfile.cmake
@JackBoosY: Any plans to merge this? The only reason I keep this open to be merge is to have a working qt 5.12.5 version for osx in the commit history of vcpkg. Otherwise I could simply close this in favor of the other Qt PR. |
@ras0219-msft @dan-shaw Could you please merge this PR first? |
@Neumann-A @JackBoosY LGTM |
continuation of #9686 (broken commit history)
requiresincludes #9680 (to make CI work)qt5-base: added iconv dependency to fontconfig
qt5-imageformat: removed freeglut dependency on osx
closes #6733
closes #9299
duplicate
closes #10173