Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f |
||
|---|---|---|
| .. | ||
| qaction | ||
| qactiongroup | ||
| qapplication | ||
| qboxlayout | ||
| qdesktopwidget | ||
| qformlayout | ||
| qgridlayout | ||
| qlayout | ||
| qshortcut | ||
| qsizepolicy | ||
| qstackedlayout | ||
| qtooltip | ||
| qwidget | ||
| qwidget_window | ||
| qwidgetaction | ||
| qwidgetmetatype | ||
| qwidgetsvariant | ||
| qwindowcontainer | ||
| kernel.pro | ||