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.

Sign up for GitHub

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

[Qt5] Update Qt latest to 5.14.1 #10009

Closed
wants to merge 133 commits into from
Closed

[Qt5] Update Qt latest to 5.14.1 #10009

wants to merge 133 commits into from

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented Feb 10, 2020 •
edited
Loading

follow up PR to #9860. Made latest default feature to test CI run.
Needs testing against ParaView PR #9960 to make sure that everything is linked in correctly. But if ParaView builds with it, it should generally work with everything
Done testing Paraview builds and runs fine with Qt 5.12.7 and Qt 5.14.1

closes #10344
closes #10338

Neumann-A and others added 30 commits November 25, 2019 20:48
@Neumann-A
make qt5 all features and add the missing qt modules
6998128
@Neumann-A
fix control
0ceda59
@Neumann-A
qt5 webengine enviromnent setup
2d3447f
@Neumann-A
copy qtminimal plugin to tools
f19e368
@Neumann-A
add opengles3 option for testing
98eb8ac
@Neumann-A
Merge remote-tracking branch 'upstream/master' into make_qt_metaport_…
880edcd 
…feature

# Conflicts:
#	ports/qt5-base/portfile.cmake
@Neumann-A
[qt5-imageformats] freeglut is not a dependency on osx
6e7c510
@Neumann-A
[qt5-base] fontconfig can require iconv on linux and osx
a6265b8
@Neumann-A
include the jasper fix to get CI coverage?
e99b626
@Neumann-A
trying to get ci coverage for qt on osx
8b9b188
@Neumann-A
Revert "trying to get ci coverage for qt on osx"
56b493f 
This reverts commit 8b9b188.
@Neumann-A
apply the correct ci hack
7058612
@Neumann-A
fix wrapper to include macosx debug suffix
bf12fef
@Neumann-A
update baseline
486580c
@Neumann-A
first try to fix the Qt5 cmake configs at the root.
1a744c9
@Neumann-A
fix missing backslash
baaa467
@Neumann-A
fix plugin patch
65531c3
@Neumann-A
fix qt config patch
0c3767c
@Neumann-A
remove 90% of fixcmake.py
795acd0
@Neumann-A
update baseline
2c43ad4
@Neumann-A
experimental removal of fixcmake.py and dll copying into tools/qt5/bin
430e311
@Neumann-A
fix experimental dll copying.
7957d50
@Neumann-A
fix static windows builds
a7d5029
@Neumann-A
fix static builds
d62c0ee
@Neumann-A
fix plugin copy
8da5f7e
@Neumann-A
add quotes around configuration to make it work
cf1ff50
@Neumann-A
remove dll debug messages
136322c
@Neumann-A
note about the cmake fix
d0446cf
@Neumann-A
revert fontconfig changes on linux. Make qt.conf relative and not abs…
4779bc0 
…olute
@Neumann-A
make qt.conf relative
728e9bd
@Neumann-A
Copy link
Contributor Author

@longhuan2018: Triplet ?; Linked Qt5 CMake target? Are you using [latest] feature or are you building 5.12.7? I am currently testing building paraview with this PR on windows.

@longhuan2018
Copy link
Contributor

longhuan2018 commented Mar 11, 2020 •
edited
Loading

@longhuan2018: Triplet ?; Linked Qt5 CMake target? Are you using [latest] feature or are you building 5.12.7? I am currently testing building paraview with this PR on windows.

I am using latest, and I also upgraded it to 5.14.1, just by modifying the hash value. But I am not based on this PR

@Neumann-A
Copy link
Contributor Author

@longhuan2018: Ok if you are not using this PR please don't mention linkage errors. This PR has additional patches to the Qt5XXXConfig.cmake.in to [latest] to fix the linkage. The reason you see those linkage problems is that _populate_UiTools_target_properties(DEBUG "Qt5UiToolsd.lib" "" FALSE) is called with the last argument being set to FALSE. This eliminates the required generator expression in the INTERFACE_LINK_PROPERTIES.

@longhuan2018
Copy link
Contributor

@longhuan2018: Ok if you are not using this PR please don't mention linkage errors. This PR has additional patches to the Qt5XXXConfig.cmake.in to [latest] to fix the linkage. The reason you see those linkage problems is that is called with the last argument being set to FALSE. This eliminates the required generator expression in the INTERFACE_LINK_PROPERTIES._populate_UiTools_target_properties(DEBUG "Qt5UiToolsd.lib" "" FALSE)

_populate_UiTools_target_properties

OK, then I will also use this PR to test my program

@Neumann-A
Copy link
Contributor Author

@longhuan2018 : Just remove the FATAL_ERROR and additional CI code add the end of the qt5-base portfile.cmake or you won't get far currently ;) (I require some files from ci check them for each platform once)

@Neumann-A Neumann-A mentioned this pull request Mar 11, 2020
Merged
@JackBoosY
Copy link
Contributor

JackBoosY commented Mar 12, 2020 •
edited
Loading

That's really a hard work, thanks!

@traversaro traversaro mentioned this pull request Mar 15, 2020
Closed
3 tasks
@JackBoosY
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Pull request contains merge conflicts.

1 similar comment
@azure-pipelines
Copy link

Pull request contains merge conflicts.

@Neumann-A
Merge branch 'fix_osx_qt_2' into make_qt_metaport_feature
63c51af 
# Conflicts:
#	scripts/ci.baseline.txt
@Neumann-A
Merge branch 'make_qt_metaport_feature' into update_qt_latest_5_14_1
3a39083
@Neumann-A
Merge remote-tracking branch 'upstream/master' into make_qt_metaport_…
fccd2da 
…feature

# Conflicts:
#	ports/qt5-activeqt/CONTROL
#	ports/qt5-base/CONTROL
#	ports/qt5-gamepad/CONTROL
#	ports/qt5-graphicaleffects/CONTROL
#	ports/qt5-networkauth/CONTROL
#	ports/qt5-purchasing/CONTROL
#	ports/qt5-remoteobjects/CONTROL
#	ports/qt5-sensors/CONTROL
#	ports/qt5-serialport/CONTROL
#	ports/qt5-tools/CONTROL
#	ports/qt5-webchannel/CONTROL
#	scripts/ci.baseline.txt
@Neumann-A
Merge branch 'make_qt_metaport_feature' into update_qt_latest_5_14_1
98bf02a
@Neumann-A
update baseline
1f3a343
@Neumann-A
Merge branch 'make_qt_metaport_feature' into update_qt_latest_5_14_1
545b525
@JackBoosY
Copy link
Contributor

/azp run

@JackBoosY
Copy link
Contributor

Oh, this PR exists so long...

@JackBoosY
Copy link
Contributor

/azp run

@Neumann-A Neumann-A mentioned this pull request Mar 28, 2020
Closed
@Neumann-A
Copy link
Contributor Author

outdated 5.14.2 released

@Neumann-A Neumann-A closed this Apr 1, 2020
@Neumann-A Neumann-A mentioned this pull request Apr 1, 2020
Merged
@Neumann-A Neumann-A deleted the update_qt_latest_5_14_1 branch April 27, 2020 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@JackBoosY JackBoosY

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

qt5[latest] update to 5.14.1 [qt5-imageformats] build failure
4 participants
@Neumann-A @MVoz @longhuan2018 @JackBoosY