Conflicts: .qmake.conf src/corelib/doc/src/objectmodel/signalsandslots.qdoc src/plugins/platforms/cocoa/qcocoamenuloader.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp tests/auto/gui/image/qimage/tst_qimage.cpp Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5 |
||
|---|---|---|
| .. | ||
| codecs | ||
| completer | ||
| customcompleter | ||
| echoplugin | ||
| i18n | ||
| plugandpaint | ||
| regexp | ||
| regularexpression | ||
| settingseditor | ||
| styleplugin | ||
| treemodelcompleter | ||
| undo | ||
| undoframework | ||
| tools.pro | ||