0fc569184c
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 |
||
---|---|---|
.. | ||
android | ||
cmake | ||
mac | ||
unix | ||
configure.json | ||
dummy.cpp | ||
macros.cpp |