Skip to content
  • Liang Qi's avatar
    Merge remote-tracking branch 'origin/5.9' into 5.10 · 19dd2ca9
    Liang Qi authored
     Conflicts:
    	examples/opengl/qopenglwidget/main.cpp
    	src/3rdparty/pcre2/src/pcre2_printint.c
    	src/plugins/platforms/cocoa/qnsview.mm
    	src/widgets/widgets/qcombobox.cpp
    
    Change-Id: I37ced9da1e8056f95851568bcc52cd5dc34f56af
    19dd2ca9