Skip to content
  • Liang Qi's avatar
    Merge remote-tracking branch 'origin/5.13' into 5.14 · 6a36fe90
    Liang Qi authored
     Conflicts:
    	src/corelib/codecs/qicucodec.cpp
    	src/dbus/qdbusserver.cpp
    	src/gui/painting/qbezier.cpp
    	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
    	src/plugins/printsupport/cups/qppdprintdevice.cpp
    
    Change-Id: I2703128bb64baf5580fbc2c2061b55b0f0611d2a
    6a36fe90