Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62 |
||
|---|---|---|
| .. | ||
| qabstractprintdialog | ||
| qcolordialog | ||
| qdialog | ||
| qerrormessage | ||
| qfiledialog | ||
| qfiledialog2 | ||
| qfilesystemmodel | ||
| qfontdialog | ||
| qinputdialog | ||
| qmessagebox | ||
| qprogressdialog | ||
| qsidebar | ||
| qwizard | ||
| dialogs.pro | ||