Conflicts: src/corelib/corelib.pro src/corelib/global/qrandom.cpp src/network/access/qhttpnetworkrequest_p.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoansmenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/offscreen/qoffscreenintegration.h src/widgets/kernel/qaction.cpp src/widgets/widgets.pro Done-with: Andy Shaw <andy.shaw@qt.io> Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d |
||
|---|---|---|
| .. | ||
| qicoimageformat | ||
| qicon | ||
| qiconhighdpi | ||
| qimage | ||
| qimageiohandler | ||
| qimagereader | ||
| qimagewriter | ||
| qmovie | ||
| qpicture | ||
| qpixmap | ||
| qpixmapcache | ||
| image.pro | ||