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

[qt5] update qt to 5.15 and make ports depend on qt5-base[core]. #11596

Merged
merged 43 commits into from
Jul 8, 2020

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented May 26, 2020

closes #11594

and so it starts again ....

  • Figure out whats wrong with qt5-x11extras on linux again or try to figure out what is missing in CI (needs logs from qt5-base since that is the source of the error) (@JackBoosY: Could get CI logs for qt5-base:x64-linux?)
  • Try fixing qwt by upgrading to 6.1.4
  • Fix qt5-webengine again (lets see if ci is able to build it. @heydojo: Mind testing?)
  • Have somebody check the qt5-location:x64-windows-static regression (Cannot create parent directory) (seems to be a bit flaky had the error two times on my pc and i just retried. Maybe disable parallel build if too flaky for ci?)

Note for reviewers: The patches are the same as for Qt 5.14. I just removed the old 5.12.8 patches and renamed the patches from Qt 5.14

@cenit
Copy link
Contributor

cenit commented May 26, 2020

Why the qt5-base[core] edit? Without default features, it does not look necessary at all

@Neumann-A
Copy link
Contributor Author

@cenit. Correctness. It should mostly always be <port>[core] if <port> can have some significant features. Also features for qt5-base are not unlikely since this are the possible options:
config_help.txt

@JackBoosY
Copy link
Contributor

Hmm...I can't get the log if there is no failure in the CI test.

ports/qt5-winextras/CONTROL Outdated Show resolved Hide resolved
@JackBoosY
Copy link
Contributor

Vcpkg has a bug when using [core] in Default-features. See #11602.

Neumann-A and others added 2 commits May 27, 2020 08:57
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
@Neumann-A
Copy link
Contributor Author

@JackBoosY: That is not a bug but a feature of vcpkg. The user has to be explicit about what he wants if he don't want to have the default set of features (as written in the issue itself)

@Neumann-A
Copy link
Contributor Author

@JackBoosY: I don't think the Linux CI should be green qt5-x11extras is still failing in https://github.com/microsoft/vcpkg/runs/712070460

@JackBoosY
Copy link
Contributor

Please get logs here.

Qt is now configured for building. Just run 'make'.
Once everything is built, you must run 'make install'.
Qt will be installed into '/mnt/_work/1/s/installed/x64-linux'.

Prior to reconfiguration, make sure you remove any leftovers from
the previous build.

I don't think that has error there, maybe just a misjudgment in vcpkg_configure_qmake or else.

@Neumann-A
Copy link
Contributor Author

Neumann-A commented May 27, 2020

<snip> solved

@Neumann-A
Copy link
Contributor Author

Neumann-A commented May 27, 2020

  X11 specific:
    XLib ................................. yes
    XCB Xlib ............................. yes
    EGL on X11 ........................... no
    xkbcommon-x11 ........................ yes

The egl checks fails and that is why EGL on X11 says no

Edit: Solved

@BillyONeal BillyONeal removed the depends:vm-update PR contains changes to the VM provisioning scripts label Jul 1, 2020
@BillyONeal
Copy link
Member

@Neumann-A VMs have been updated with your changes, dropping the depends:vm-update tag. If there are still CI regressions you'll want to look at those.

# Conflicts:
#	ports/paraview/portfile.cmake
#	ports/qt5-base/CONTROL
#	ports/qt5-base/portfile.cmake
#	scripts/ci.baseline.txt
…_5_15_0

# Conflicts:
#	ports/paraview/portfile.cmake
#	ports/qt5-base/portfile.cmake
@Neumann-A
Copy link
Contributor Author

quickfix seems to be a bit flakky? (Why is it even rebuild here it only depends on openssl?)

Since linux and windows are already green I assume the same for osx. I highly recommend to make paraview tools a default feature if the embree issue in netCDF is resolved to make paraview a test of Qt.
If this is merged I'll finish the cmake PR which can be used as a second test to see if Qt is properly built/linking.

@BillyONeal BillyONeal requested a review from JackBoosY July 1, 2020 23:17
@BillyONeal
Copy link
Member

Quickfix is broken in master right now, your change is an innocent bystander. @JackBoosY you were previously 'Request Changes' on this PR, does it look good to you now?

@Neumann-A Thanks for your contribution!

@BillyONeal
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@BillyONeal
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Neumann-A
Copy link
Contributor Author

@BillyONeal: Please rerun x64-windows. error is:
D:/installed/x64-windows/tools/qt5/debug/mkspecs/features/qt_plugin.prf:59: Cannot write file D:\buildtrees\qt5-imageformats\x64-windows-dbg\mkspecs\modules-inst\qt_plugin_qwebp.pri: Cannot create parent directory
Happens sometimes don't know why but retrying typically solves it.

@JackBoosY
Copy link
Contributor

JackBoosY commented Jul 6, 2020

Due to the long duration of the PR and the long test time, the format problem can be waited for the next update and fix.

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Jul 6, 2020
@ras0219-msft ras0219-msft merged commit 3bffe1c into microsoft:master Jul 8, 2020
@ras0219-msft
Copy link
Contributor

It is merged!

Thank you @Neumann-A once again for the marathon of effort required to pilot the Qt ship :)

@BillyONeal
Copy link
Member

THANK YOU!!!!!!!

@JackBoosY
Copy link
Contributor

Thanks for your hard work @Neumann-A!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Qt5] update to 5.15 LTS
6 participants