Skip to content

[Qt5] Update to 5.12.7 and add missing qt submodules#9860

Closed
Neumann-A wants to merge 111 commits intomicrosoft:masterfrom
Neumann-A:make_qt_metaport_feature
Closed

[Qt5] Update to 5.12.7 and add missing qt submodules#9860
Neumann-A wants to merge 111 commits intomicrosoft:masterfrom
Neumann-A:make_qt_metaport_feature

Conversation

@Neumann-A
Copy link
Copy Markdown
Contributor

@Neumann-A Neumann-A commented Jan 31, 2020 •
edited
Loading

merge #9705 first:

currently: mainly CI run to get the missing hashes

probably will break latest feature which will be fixed by an upcoming PR updating latest to 5.14.1.

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 and others added 23 commits February 25, 2020 15:13
@Neumann-A
bump control
90521fd
@Neumann-A
Merge branch 'fix_osx_qt_2' into make_qt_metaport_feature
e9c0dfd 
# Conflicts:
#	ports/qt5-base/CONTROL
#	ports/qt5-tools/CONTROL
@Neumann-A
update webengine control
2095dc1
@Neumann-A
update CI to skip webengine.
f22eb69
@Neumann-A
update baseline
0bd892e
@Neumann-A
ws change to osg-qt
108d47f
@Neumann-A
Merge remote-tracking branch 'upstream/master' into make_qt_metaport_…
22ab675 
…feature
@Neumann-A
remove kd-soap from faillist
af68916
@Neumann-A
Merge branch 'master' into fix_osx_qt_2
250b3ec
@Neumann-A
reset ci baseline to upstream/master
b44bd0c
@Neumann-A
Merge remote-tracking branch 'upstream/master' into fix_osx_qt_2
276e43d
@Neumann-A
update baseline
ed966fb
@Neumann-A
fix osg-qt?
4fa5b57
@Neumann-A
skip ms-angle on osx and linux since the normal angle port should be …
40b9c87 
…used!
@Neumann-A
update ci baseline
47c2ae3
@Neumann-A
try adding fontconfig manually
c317b90
@Neumann-A
update ci baseline to remove osg-qt for the time being
6842aa9
@Neumann-A
remove manual library.
30c5687
@Neumann-A
Merge branch 'fix_osx_qt_2' into make_qt_metaport_feature
a0aaf47 
# Conflicts:
#	scripts/ci.baseline.txt
@Neumann-A
Merge remote-tracking branch 'upstream/master' into fix_osx_qt_2
38b34fa 
# Conflicts:
#	scripts/ci.baseline.txt
@Neumann-A
Merge branch 'fix_osx_qt_2' into make_qt_metaport_feature
63c51af 
# Conflicts:
#	scripts/ci.baseline.txt
@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
update baseline
1f3a343
@JackBoosY
Copy link
Copy Markdown
Contributor

JackBoosY commented Mar 26, 2020

/azp run

This was referenced Mar 28, 2020
Closed
Closed
Merged
@Neumann-A
Copy link
Copy Markdown
Contributor Author

Neumann-A commented Apr 3, 2020

closing in favor for #10644

@Neumann-A Neumann-A closed this Apr 3, 2020
@Neumann-A Neumann-A deleted the make_qt_metaport_feature branch April 27, 2020 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@LilyWangL LilyWangL

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Neumann-A @pwilkin @JackBoosY @LilyWangL