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 to 5.12.8 #10749

Merged
merged 160 commits into from Apr 24, 2020
Merged

[Qt5] Update qt to 5.12.8 #10749

merged 160 commits into from Apr 24, 2020

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented Apr 8, 2020 •
edited

Update of #10644 to Qt 5.12.8
starts at 8810496
merge previous Qt PRs first, so that they are available in vcpkg x-history

closes #10998

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
fix escaping of . in regex
b0be81c
@Neumann-A
Merge remote-tracking branch 'upstream/master' into update_qt_latest_…
4760073 
…5_14_2

# Conflicts:
#	scripts/ci.baseline.txt
@Neumann-A
remove one to many \\
355ac80
@Neumann-A
remove latest as a default feature
3578a0b
@Neumann-A
reenable messages to debug osg-qt issue on osx.
5e0384f
@Neumann-A
small cmake options details.
70979f8 
might need to patch cmakelists.txt if this is not working
@Neumann-A
Merge remote-tracking branch 'upstream/master' into update_qt_latest_…
39b7dc5 
…5_14_2

# Conflicts:
#	ports/qt5-base/CONTROL
#	ports/qt5-base/portfile.cmake
@Neumann-A
remove unnecessary comment
b2327c4
@Neumann-A
make prl parser silent again.
d950fc7
@Neumann-A
remove canvas3d from the default features since it has been deprecate…
e5684f1 
…d and will be removed in the future
@Neumann-A
fix some remaining absolute paths.
1421e96
@Neumann-A
Merge branch 'qt_fix_absolute_paths_in_prl' into update_qt_5_12_8
2613673 
# Conflicts:
#	ports/qt5-base/CONTROL
@Neumann-A
update qt to 5.12.8
8810496
@Neumann-A
deactivate qt update script
af729b0
@Neumann-A
removed merged patch
b75dec2
@Neumann-A
remove a trailing ws and fix the mqtt hash which was missing before
3cb9ee9
@dan-shaw
Copy link
Contributor

@Neumann-A For the Qt PRs, can you also attach a sample project (CMakeLists.txt, and a simple Qt project) so we make sure we can find and link the Qt libraries correctly. These would probably go in a another folder). This will really help in testing.

@Neumann-A
Copy link
Contributor Author

@dan-shaw: I can add cmake as a port and build cmake-gui if you want ;) (actually I have the port for that already finished)

(or have https://github.com/jasondegraw/Qt-CMake-HelloWorld as a test port)

simple Qt project

unnecessary. Just build qt5-tools and than start QtDesigner or QtCreator. It uses the same build functionality as all *.pro based projects.

(or make a port for the examples in https://github.com/DarkSector/qt-project)

But you probably want to first figure out how you want to have test ports or tools be integrated into vcpkg. (although a lot of tools are already build by and integrated into vcpkg)

@Neumann-A
Merge remote-tracking branch 'upstream/master' into update_qt_5_12_8
11d71b7 
# Conflicts:
#	ports/qt5-3d/CONTROL
#	ports/qt5-activeqt/CONTROL
#	ports/qt5-base/CONTROL
#	ports/qt5-base/cmake/qt_port_hashes.cmake
#	ports/qt5-base/portfile.cmake
#	ports/qt5-charts/CONTROL
#	ports/qt5-connectivity/CONTROL
#	ports/qt5-datavis3d/CONTROL
#	ports/qt5-declarative/CONTROL
#	ports/qt5-gamepad/CONTROL
#	ports/qt5-graphicaleffects/CONTROL
#	ports/qt5-imageformats/CONTROL
#	ports/qt5-imageformats/portfile.cmake
#	ports/qt5-location/CONTROL
#	ports/qt5-macextras/CONTROL
#	ports/qt5-mqtt/CONTROL
#	ports/qt5-multimedia/CONTROL
#	ports/qt5-networkauth/CONTROL
#	ports/qt5-purchasing/CONTROL
#	ports/qt5-quickcontrols/CONTROL
#	ports/qt5-quickcontrols2/CONTROL
#	ports/qt5-remoteobjects/CONTROL
#	ports/qt5-script/CONTROL
#	ports/qt5-scxml/CONTROL
#	ports/qt5-sensors/CONTROL
#	ports/qt5-serialport/CONTROL
#	ports/qt5-speech/CONTROL
#	ports/qt5-svg/CONTROL
#	ports/qt5-tools/CONTROL
#	ports/qt5-virtualkeyboard/CONTROL
#	ports/qt5-webchannel/CONTROL
#	ports/qt5-webengine/portfile.cmake
#	ports/qt5-websockets/CONTROL
#	ports/qt5-webview/CONTROL
#	ports/qt5-winextras/CONTROL
#	ports/qt5-xmlpatterns/CONTROL
#	scripts/ci.baseline.txt
@Neumann-A
revert some ws changes
7deb2a9
@Neumann-A
fix version numbers in qt5 metaport
69d3d64
@Neumann-A Neumann-A marked this pull request as ready for review April 24, 2020 06:35
@Neumann-A Neumann-A mentioned this pull request Apr 24, 2020
Closed
@ras0219-msft ras0219-msft merged commit 28ab0b1 into microsoft:master Apr 24, 2020
@ras0219-msft
Copy link
Contributor

LGTM!

@Neumann-A Neumann-A deleted the update_qt_5_12_8 branch April 24, 2020 22:31
@spindensity spindensity mentioned this pull request Apr 25, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ras0219-msft ras0219-msft

@PhoebeHui PhoebeHui

@JackBoosY JackBoosY

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

The version in description of qt5[latest] is wrong
5 participants
@Neumann-A @dan-shaw @ras0219-msft @PhoebeHui @JackBoosY