Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qsysinfo.h src/corelib/kernel/qcoreapplication_win.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/plugins/platforms/windows/qwindowsglcontext.cpp src/plugins/platforms/windows/qwindowsglcontext.h Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978 |
||
|---|---|---|
| .. | ||
| qsql | ||
| qsqldatabase | ||
| qsqldriver | ||
| qsqlerror | ||
| qsqlfield | ||
| qsqlquery | ||
| qsqlrecord | ||
| qsqlresult | ||
| qsqlthread | ||
| kernel.pro | ||