Skip to content
  • Liang Qi's avatar
    Merge remote-tracking branch 'origin/5.8' into 5.9 · 0fc56918
    Liang Qi authored
    Conflicts:
    	src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
    	src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp
    	src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
    	src/widgets/widgets/qtabbar.cpp
    
    Change-Id: Iaa9daee5f7a6490d56257a3824730a35751ceb05
    0fc56918